lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 034/639] ASoC: wm9712: fix unused variable warning
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit 18380dcc52cc8965e5144ce33fdfad7e168679a5 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/wm9712.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
    index ade34c26ad2f3..e873baa9e7780 100644
    --- a/sound/soc/codecs/wm9712.c
    +++ b/sound/soc/codecs/wm9712.c
    @@ -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)) {
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:01    [W:2.325 / U:24.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site