aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-09-14 08:24:38 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-15 07:03:34 -0400
commitc6d5cca0a0e565101e3ef8d37270f5316d7c5638 (patch)
tree9181540649debe080b384921b0865305028142ed
parent12280faea62c7e2d7124996d9342b483ac1706d3 (diff)
ASoC: Remove needless codec->bias_level assignment to SND_SOC_BIAS_OFF
This assignment is done by the snd_soc_register_codec so there is no need to redo it in probe function of a codec driver. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/ak4671.c1
-rw-r--r--sound/soc/codecs/ssm2602.c1
-rw-r--r--sound/soc/codecs/tlv320dac33.c1
-rw-r--r--sound/soc/codecs/twl4030.c1
-rw-r--r--sound/soc/codecs/wm8510.c1
-rw-r--r--sound/soc/codecs/wm8731.c2
-rw-r--r--sound/soc/codecs/wm8753.c1
-rw-r--r--sound/soc/codecs/wm8990.c1
8 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c
index 239f0562003c..24f5f49bb9d2 100644
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
@@ -642,7 +642,6 @@ static int ak4671_probe(struct snd_soc_codec *codec)
642 int ret; 642 int ret;
643 643
644 codec->hw_write = (hw_write_t)i2c_master_send; 644 codec->hw_write = (hw_write_t)i2c_master_send;
645 codec->bias_level = SND_SOC_BIAS_OFF;
646 645
647 ret = snd_soc_codec_set_cache_io(codec, 8, 8, ak4671->control_type); 646 ret = snd_soc_codec_set_cache_io(codec, 8, 8, ak4671->control_type);
648 if (ret < 0) { 647 if (ret < 0) {
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index 67d8c044ca04..6f38d619bf8a 100644
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -560,7 +560,6 @@ static int ssm2602_probe(struct snd_soc_codec *codec)
560 560
561 pr_info("ssm2602 Audio Codec %s", SSM2602_VERSION); 561 pr_info("ssm2602 Audio Codec %s", SSM2602_VERSION);
562 562
563 codec->bias_level = SND_SOC_BIAS_OFF,
564 codec->control_data = ssm2602->control_data; 563 codec->control_data = ssm2602->control_data;
565 564
566 ssm2602_reset(codec); 565 ssm2602_reset(codec);
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index a3c5b521da6a..bf6d01f4a45a 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -1385,7 +1385,6 @@ static int dac33_soc_probe(struct snd_soc_codec *codec)
1385 1385
1386 codec->control_data = dac33->control_data; 1386 codec->control_data = dac33->control_data;
1387 codec->hw_write = (hw_write_t) i2c_master_send; 1387 codec->hw_write = (hw_write_t) i2c_master_send;
1388 codec->bias_level = SND_SOC_BIAS_OFF;
1389 codec->idle_bias_off = 1; 1388 codec->idle_bias_off = 1;
1390 dac33->codec = codec; 1389 dac33->codec = codec;
1391 1390
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index c7ee1a4c9d99..cbebec6ba1ba 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -2245,7 +2245,6 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec)
2245 snd_soc_codec_set_drvdata(codec, twl4030); 2245 snd_soc_codec_set_drvdata(codec, twl4030);
2246 /* Set the defaults, and power up the codec */ 2246 /* Set the defaults, and power up the codec */
2247 twl4030->sysclk = twl4030_codec_get_mclk() / 1000; 2247 twl4030->sysclk = twl4030_codec_get_mclk() / 1000;
2248 codec->bias_level = SND_SOC_BIAS_OFF;
2249 codec->idle_bias_off = 1; 2248 codec->idle_bias_off = 1;
2250 2249
2251 twl4030_init_chip(codec); 2250 twl4030_init_chip(codec);
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index d00da2001a12..02ecf54de020 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -569,7 +569,6 @@ static int wm8510_probe(struct snd_soc_codec *codec)
569 wm8510_reset(codec); 569 wm8510_reset(codec);
570 570
571 /* power on device */ 571 /* power on device */
572 codec->bias_level = SND_SOC_BIAS_OFF;
573 wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY); 572 wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
574 snd_soc_add_controls(codec, wm8510_snd_controls, 573 snd_soc_add_controls(codec, wm8510_snd_controls,
575 ARRAY_SIZE(wm8510_snd_controls)); 574 ARRAY_SIZE(wm8510_snd_controls));
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 28275014c73d..bdce125bbd81 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -488,8 +488,6 @@ static int wm8731_probe(struct snd_soc_codec *codec)
488 struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); 488 struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
489 int ret = 0, i; 489 int ret = 0, i;
490 490
491 codec->bias_level = SND_SOC_BIAS_OFF,
492
493 ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8731->control_type); 491 ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8731->control_type);
494 if (ret < 0) { 492 if (ret < 0) {
495 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); 493 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 0b0e3b3ebbbb..64ea06610038 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1550,7 +1550,6 @@ static int wm8753_probe(struct snd_soc_codec *codec)
1550 struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec); 1550 struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
1551 int ret = 0, reg; 1551 int ret = 0, reg;
1552 1552
1553 codec->bias_level = SND_SOC_BIAS_OFF;
1554 INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work); 1553 INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work);
1555 1554
1556 ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8753->control_type); 1555 ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8753->control_type);
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 0ffecbd1e33b..264828e4e67c 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1354,7 +1354,6 @@ static int wm8990_probe(struct snd_soc_codec *codec)
1354 wm8990_reset(codec); 1354 wm8990_reset(codec);
1355 1355
1356 /* charge output caps */ 1356 /* charge output caps */
1357 codec->bias_level = SND_SOC_BIAS_OFF;
1358 wm8990_set_bias_level(codec, SND_SOC_BIAS_STANDBY); 1357 wm8990_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
1359 1358
1360 reg = snd_soc_read(codec, WM8990_AUDIO_INTERFACE_4); 1359 reg = snd_soc_read(codec, WM8990_AUDIO_INTERFACE_4);