redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: rt5677: Remove NULL test for desc before gpiod_set_value_cansleep call

Browse source 
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>
This commit is contained in:
Axel Lin 2015-07-23 23:32:04 +08:00 committed by Mark Brown
parent 9bfde72157
commit f285f16103
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sound/soc/codecs/rt5677.c
View 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);