From f66a91ff8e83e95c822691270d883cbcb3244302 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 9 Sep 2014 20:42:43 +0200 Subject: ASoC: da732x: Remove unnecessary idle_bias_off initialization idle_bias_off is false by default, no need to set it explicitly. Signed-off-by: Lars-Peter Clausen Signed-off-by: Mark Brown --- sound/soc/codecs/da732x.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'sound/soc/codecs/da732x.c') diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index 2fae31cb0067..edcbfeafc8cb 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c @@ -1511,12 +1511,9 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec, static int da732x_probe(struct snd_soc_codec *codec) { struct da732x_priv *da732x = snd_soc_codec_get_drvdata(codec); - struct snd_soc_dapm_context *dapm = &codec->dapm; da732x->codec = codec; - dapm->idle_bias_off = false; - da732x_set_bias_level(codec, SND_SOC_BIAS_STANDBY); return 0; -- cgit v1.2.3 From ee6b42ee21b16aa322758fdab0d57082761b09fd Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 9 Sep 2014 20:42:44 +0200 Subject: ASoC: da732x: Remove unused codec field form da732x_priv struct The field is initialized in the probe callback, but never used again. So it can be removed. Signed-off-by: Lars-Peter Clausen Signed-off-by: Mark Brown --- sound/soc/codecs/da732x.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'sound/soc/codecs/da732x.c') diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index edcbfeafc8cb..c28cf339f066 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c @@ -35,7 +35,6 @@ struct da732x_priv { struct regmap *regmap; - struct snd_soc_codec *codec; unsigned int sysclk; bool pll_en; @@ -1512,8 +1511,6 @@ static int da732x_probe(struct snd_soc_codec *codec) { struct da732x_priv *da732x = snd_soc_codec_get_drvdata(codec); - da732x->codec = codec; - da732x_set_bias_level(codec, SND_SOC_BIAS_STANDBY); return 0; -- cgit v1.2.3 From f0b99ca041258ed0eb27dc724de22d84dab78a7c Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 9 Sep 2014 20:42:45 +0200 Subject: ASoC: da732x: Cleanup manual bias level transitions Since the ASoC core now takes care of setting the bias level to SND_SOC_BIAS_OFF when removing the CODEC there is no need to do it manually anymore either. The manual transition to SND_SOC_BIAS_STANDBY at the end of CODEC probe() can also be removed as the core will automatically do this after the CODEC has been probed. Signed-off-by: Lars-Peter Clausen Signed-off-by: Mark Brown --- sound/soc/codecs/da732x.c | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'sound/soc/codecs/da732x.c') diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index c28cf339f066..f35e83e00c8d 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c @@ -1507,26 +1507,7 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec, return 0; } -static int da732x_probe(struct snd_soc_codec *codec) -{ - struct da732x_priv *da732x = snd_soc_codec_get_drvdata(codec); - - da732x_set_bias_level(codec, SND_SOC_BIAS_STANDBY); - - return 0; -} - -static int da732x_remove(struct snd_soc_codec *codec) -{ - - da732x_set_bias_level(codec, SND_SOC_BIAS_OFF); - - return 0; -} - static struct snd_soc_codec_driver soc_codec_dev_da732x = { - .probe = da732x_probe, - .remove = da732x_remove, .set_bias_level = da732x_set_bias_level, .controls = da732x_snd_controls, .num_controls = ARRAY_SIZE(da732x_snd_controls), -- cgit v1.2.3 From cd9241e44af3d49977c39ddadbefbb719e2a4baf Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Sat, 4 Oct 2014 02:17:08 +0900 Subject: ASoC: da732x: Remove unnecessary KERN_ERR in pr_err() This patch remove unnecessary KERN_ERR in pr_err(). Signed-off-by: Masanari Iida Signed-off-by: Mark Brown --- sound/soc/codecs/da732x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/soc/codecs/da732x.c') diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index 2fae31cb0067..fa15fa1c0516 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c @@ -217,7 +217,7 @@ static void da732x_set_charge_pump(struct snd_soc_codec *codec, int state) snd_soc_write(codec, DA732X_REG_CP_CTRL1, DA723X_CP_DIS); break; default: - pr_err(KERN_ERR "Wrong charge pump state\n"); + pr_err("Wrong charge pump state\n"); break; } } -- cgit v1.2.3