diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2015-06-04 16:04:19 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-04 17:50:03 +0100 |
| commit | dd6e3053405c2fe7baa36e4fe2a12083f508abfc (patch) | |
| tree | 5fa79778ae3dc2efae59273bfad572184271aa9b /sound | |
| parent | e3606aa496c98595cb206ac8fed9bc8152ffe34e (diff) | |
| download | linux-dd6e3053405c2fe7baa36e4fe2a12083f508abfc.tar.bz2 | |
ASoC: tas2552: Simplify and reverse the functionality of tas2552_sw_shutdown
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/tas2552.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c index 2d52a397161d..61419e2f833b 100644 --- a/sound/soc/codecs/tas2552.c +++ b/sound/soc/codecs/tas2552.c @@ -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, @@ -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); @@ -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); |