]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: wm9712: fix unused variable warning
authorArnd Bergmann <arnd@arndb.de>
Wed, 26 Sep 2018 19:37:40 +0000 (21:37 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 27 Sep 2018 22:22:54 +0000 (23:22 +0100)
The 'ret' variable is now only used in an #ifdef, and causes a
warning if it is declared outside of that block:

sound/soc/codecs/wm9712.c: In function 'wm9712_soc_probe':
sound/soc/codecs/wm9712.c:641:6: error: unused variable 'ret' [-Werror=unused-variable]

Fixes: 2ed1a8e0ce8d ("ASoC: wm9712: add ac97 new bus support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wm9712.c

index ade34c26ad2f3381d806ff069044d77c4186c3d8..e873baa9e7780fdc6286b40d703615319ce7284a 100644 (file)
@@ -638,13 +638,14 @@ static int wm9712_soc_probe(struct snd_soc_component *component)
 {
        struct wm9712_priv *wm9712 = snd_soc_component_get_drvdata(component);
        struct regmap *regmap;
-       int ret;
 
        if (wm9712->mfd_pdata) {
                wm9712->ac97 = wm9712->mfd_pdata->ac97;
                regmap = wm9712->mfd_pdata->regmap;
        } else {
 #ifdef CONFIG_SND_SOC_AC97_BUS
+               int ret;
+
                wm9712->ac97 = snd_soc_new_ac97_component(component, WM9712_VENDOR_ID,
                                                      WM9712_VENDOR_ID_MASK);
                if (IS_ERR(wm9712->ac97)) {