drivers: staging: audio: Fix the missing header file for helper file

This patch fixes the warning reported for missing prototypes due to
missing header file. Also, it includes changes to remove
unused_but_set_variables.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Vaibhav Agarwal <vaibhav.sr@gmail.com>
Link: https://lore.kernel.org/r/6341df9b0b5985047af0bbbc8e136481ac515b25.1594290158.git.vaibhav.sr@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/greybus/audio_helper.c b/drivers/staging/greybus/audio_helper.c
index faaa3970811856ab874246cf914b57f42d0e950f..8b100a71f02ef09919fcb38acf561b006f98b14a 100644 (file)
--- a/drivers/staging/greybus/audio_helper.c
+++ b/drivers/staging/greybus/audio_helper.c
@@ -7,6 +7,7 @@
 #include <sound/core.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
+#include "audio_helper.h"
 
 #define gbaudio_dapm_for_each_direction(dir) \
        for ((dir) = SND_SOC_DAPM_DIR_IN; (dir) <= SND_SOC_DAPM_DIR_OUT; \

diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c
index ad88d3127a60e953e0f4f1e4fe0e897993a1938a..2f9fdbdcd547017b8704b7839f8cb33f658ab110 100644 (file)
--- a/drivers/staging/greybus/audio_topology.c
+++ b/drivers/staging/greybus/audio_topology.c
@@ -28,14 +28,16 @@ static struct gbaudio_module_info *find_gb_module(
                                        struct gbaudio_codec_info *codec,
                                        char const *name)
 {
-       int dev_id, ret;
+       int dev_id;
        char begin[NAME_SIZE];
        struct gbaudio_module_info *module;
 
        if (!name)
                return NULL;
 
-       ret = sscanf(name, "%s %d", begin, &dev_id);
+       if (sscanf(name, "%s %d", begin, &dev_id) != 2)
+               return NULL;
+
        dev_dbg(codec->dev, "%s:Find module#%d\n", __func__, dev_id);
 
        mutex_lock(&codec->lock);
@@ -377,7 +379,6 @@ static int gbcodec_mixer_dapm_ctl_get(struct snd_kcontrol *kcontrol,
                                      struct snd_ctl_elem_value *ucontrol)
 {
        int ret;
-       struct gb_audio_ctl_elem_info *info;
        struct gbaudio_ctl_pvt *data;
        struct gb_audio_ctl_elem_value gbvalue;
        struct gbaudio_module_info *module;
@@ -393,7 +394,6 @@ static int gbcodec_mixer_dapm_ctl_get(struct snd_kcontrol *kcontrol,
                return -EINVAL;
 
        data = (struct gbaudio_ctl_pvt *)kcontrol->private_value;
-       info = (struct gb_audio_ctl_elem_info *)data->info;
        bundle = to_gb_bundle(module->dev);
 
        if (data->vcount == 2)