Skip to content

Commit

Permalink
ASoC: tas2552: Simplify and reverse the functionality of tas2552_sw_s…
Browse files Browse the repository at this point in the history
…hutdown

The function name and parameters of:
tas2552_sw_shutdown(struct tas2552_data *tas_data, int sw_shutdown)

implies that if sw_shutdown is 1 we should be entering to the software
shutdown mode.

The code can be simplified as well within the function.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Peter Ujfalusi authored and Mark Brown committed Jun 4, 2015
1 parent e3606aa commit dd6e305
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions sound/soc/codecs/tas2552.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,12 @@ static const struct snd_soc_dapm_route tas2552_audio_map[] = {
#ifdef CONFIG_PM
static void tas2552_sw_shutdown(struct tas2552_data *tas_data, int sw_shutdown)
{
u8 cfg1_reg;
u8 cfg1_reg = 0;

if (!tas_data->codec)
return;

if (sw_shutdown)
cfg1_reg = 0;
else
cfg1_reg = TAS2552_SWS;

snd_soc_update_bits(tas_data->codec, TAS2552_CFG_1, TAS2552_SWS,
Expand Down Expand Up @@ -270,7 +268,7 @@ static int tas2552_runtime_suspend(struct device *dev)
{
struct tas2552_data *tas2552 = dev_get_drvdata(dev);

tas2552_sw_shutdown(tas2552, 0);
tas2552_sw_shutdown(tas2552, 1);

regcache_cache_only(tas2552->regmap, true);
regcache_mark_dirty(tas2552->regmap);
Expand All @@ -288,7 +286,7 @@ static int tas2552_runtime_resume(struct device *dev)
if (tas2552->enable_gpio)
gpiod_set_value(tas2552->enable_gpio, 1);

tas2552_sw_shutdown(tas2552, 1);
tas2552_sw_shutdown(tas2552, 0);

regcache_cache_only(tas2552->regmap, false);
regcache_sync(tas2552->regmap);
Expand Down

0 comments on commit dd6e305

Please sign in to comment.