Skip to content

Commit

Permalink
ASoC: tas2552: Remove unneeded NULL test for tas2552->enable_gpio
Browse files Browse the repository at this point in the history
It's safe to call gpiod_set_value() with NULL desc.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Axel Lin authored and Mark Brown committed Jul 29, 2015
1 parent 95f1044 commit 82cf77a
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions sound/soc/codecs/tas2552.c
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,7 @@ static int tas2552_runtime_suspend(struct device *dev)
regcache_cache_only(tas2552->regmap, true);
regcache_mark_dirty(tas2552->regmap);

if (tas2552->enable_gpio)
gpiod_set_value(tas2552->enable_gpio, 0);
gpiod_set_value(tas2552->enable_gpio, 0);

return 0;
}
Expand All @@ -503,8 +502,7 @@ static int tas2552_runtime_resume(struct device *dev)
{
struct tas2552_data *tas2552 = dev_get_drvdata(dev);

if (tas2552->enable_gpio)
gpiod_set_value(tas2552->enable_gpio, 1);
gpiod_set_value(tas2552->enable_gpio, 1);

tas2552_sw_shutdown(tas2552, 0);

Expand Down Expand Up @@ -585,8 +583,7 @@ static int tas2552_codec_probe(struct snd_soc_codec *codec)
return ret;
}

if (tas2552->enable_gpio)
gpiod_set_value(tas2552->enable_gpio, 1);
gpiod_set_value(tas2552->enable_gpio, 1);

ret = pm_runtime_get_sync(codec->dev);
if (ret < 0) {
Expand All @@ -610,8 +607,7 @@ static int tas2552_codec_probe(struct snd_soc_codec *codec)
return 0;

probe_fail:
if (tas2552->enable_gpio)
gpiod_set_value(tas2552->enable_gpio, 0);
gpiod_set_value(tas2552->enable_gpio, 0);

regulator_bulk_disable(ARRAY_SIZE(tas2552->supplies),
tas2552->supplies);
Expand All @@ -624,8 +620,7 @@ static int tas2552_codec_remove(struct snd_soc_codec *codec)

pm_runtime_put(codec->dev);

if (tas2552->enable_gpio)
gpiod_set_value(tas2552->enable_gpio, 0);
gpiod_set_value(tas2552->enable_gpio, 0);

return 0;
};
Expand Down

0 comments on commit 82cf77a

Please sign in to comment.