Skip to content

Commit

Permalink
ASoC: rt5677: Remove NULL test for desc before gpiod_set_value_cansle…
Browse files Browse the repository at this point in the history
…ep 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>
  • Loading branch information
Axel Lin authored and Mark Brown committed Jul 23, 2015
1 parent 9bfde72 commit f285f16
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions sound/soc/codecs/rt5677.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
Expand All @@ -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);

Expand Down

0 comments on commit f285f16

Please sign in to comment.