]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: rt5677: Remove NULL test for desc before gpiod_set_value_cansleep call
authorAxel Lin <axel.lin@ingics.com>
Thu, 23 Jul 2015 15:32:04 +0000 (23:32 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 23 Jul 2015 15:46:00 +0000 (16:46 +0100)
It's safe to call gpiod_set_value_cansleep() with NULL desc.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5677.c

index 13b871f1102301797567cbbfb017ab4e18d76626..62230e05eac1aff4468d6701c8ef6f2f210a9bf5 100644 (file)
@@ -4763,10 +4763,8 @@ static int rt5677_remove(struct snd_soc_codec *codec)
        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 
        regmap_write(rt5677->regmap, RT5677_RESET, 0x10ec);
-       if (rt5677->pow_ldo2)
-               gpiod_set_value_cansleep(rt5677->pow_ldo2, 0);
-       if (rt5677->reset_pin)
-               gpiod_set_value_cansleep(rt5677->reset_pin, 0);
+       gpiod_set_value_cansleep(rt5677->pow_ldo2, 0);
+       gpiod_set_value_cansleep(rt5677->reset_pin, 0);
 
        return 0;
 }
@@ -4780,10 +4778,8 @@ static int rt5677_suspend(struct snd_soc_codec *codec)
                regcache_cache_only(rt5677->regmap, true);
                regcache_mark_dirty(rt5677->regmap);
 
-               if (rt5677->pow_ldo2)
-                       gpiod_set_value_cansleep(rt5677->pow_ldo2, 0);
-               if (rt5677->reset_pin)
-                       gpiod_set_value_cansleep(rt5677->reset_pin, 0);
+               gpiod_set_value_cansleep(rt5677->pow_ldo2, 0);
+               gpiod_set_value_cansleep(rt5677->reset_pin, 0);
        }
 
        return 0;
@@ -4794,10 +4790,8 @@ static int rt5677_resume(struct snd_soc_codec *codec)
        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 
        if (!rt5677->dsp_vad_en) {
-               if (rt5677->pow_ldo2)
-                       gpiod_set_value_cansleep(rt5677->pow_ldo2, 1);
-               if (rt5677->reset_pin)
-                       gpiod_set_value_cansleep(rt5677->reset_pin, 1);
+               gpiod_set_value_cansleep(rt5677->pow_ldo2, 1);
+               gpiod_set_value_cansleep(rt5677->reset_pin, 1);
                if (rt5677->pow_ldo2 || rt5677->reset_pin)
                        msleep(10);