aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-07-23 11:32:04 -0400
committerMark Brown <broonie@kernel.org>2015-07-23 11:46:00 -0400
commitf285f1610341af4181791938777e0affb5531278 (patch)
tree1130128aa33656870ed63ebeca96b9a012d57424
parent9bfde72157036f4eaa44f3e8982217ce1b3e14b6 (diff)
ASoC: rt5677: Remove NULL test for desc before gpiod_set_value_cansleep call
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>
-rw-r--r--sound/soc/codecs/rt5677.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index 13b871f11023..62230e05eac1 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -4763,10 +4763,8 @@ static int rt5677_remove(struct snd_soc_codec *codec)
4763 struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); 4763 struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
4764 4764
4765 regmap_write(rt5677->regmap, RT5677_RESET, 0x10ec); 4765 regmap_write(rt5677->regmap, RT5677_RESET, 0x10ec);
4766 if (rt5677->pow_ldo2) 4766 gpiod_set_value_cansleep(rt5677->pow_ldo2, 0);
4767 gpiod_set_value_cansleep(rt5677->pow_ldo2, 0); 4767 gpiod_set_value_cansleep(rt5677->reset_pin, 0);
4768 if (rt5677->reset_pin)
4769 gpiod_set_value_cansleep(rt5677->reset_pin, 0);
4770 4768
4771 return 0; 4769 return 0;
4772} 4770}
@@ -4780,10 +4778,8 @@ static int rt5677_suspend(struct snd_soc_codec *codec)
4780 regcache_cache_only(rt5677->regmap, true); 4778 regcache_cache_only(rt5677->regmap, true);
4781 regcache_mark_dirty(rt5677->regmap); 4779 regcache_mark_dirty(rt5677->regmap);
4782 4780
4783 if (rt5677->pow_ldo2) 4781 gpiod_set_value_cansleep(rt5677->pow_ldo2, 0);
4784 gpiod_set_value_cansleep(rt5677->pow_ldo2, 0); 4782 gpiod_set_value_cansleep(rt5677->reset_pin, 0);
4785 if (rt5677->reset_pin)
4786 gpiod_set_value_cansleep(rt5677->reset_pin, 0);
4787 } 4783 }
4788 4784
4789 return 0; 4785 return 0;
@@ -4794,10 +4790,8 @@ static int rt5677_resume(struct snd_soc_codec *codec)
4794 struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); 4790 struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
4795 4791
4796 if (!rt5677->dsp_vad_en) { 4792 if (!rt5677->dsp_vad_en) {
4797 if (rt5677->pow_ldo2) 4793 gpiod_set_value_cansleep(rt5677->pow_ldo2, 1);
4798 gpiod_set_value_cansleep(rt5677->pow_ldo2, 1); 4794 gpiod_set_value_cansleep(rt5677->reset_pin, 1);
4799 if (rt5677->reset_pin)
4800 gpiod_set_value_cansleep(rt5677->reset_pin, 1);
4801 if (rt5677->pow_ldo2 || rt5677->reset_pin) 4795 if (rt5677->pow_ldo2 || rt5677->reset_pin)
4802 msleep(10); 4796 msleep(10);
4803 4797