diff options
author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-03-26 01:40:31 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-14 12:22:20 -0400 |
commit | 4504badea3a3edd0d114b51a866cd98b4ff626b0 (patch) | |
tree | 526a98c8a2e5fd9afa0de7b1e949c4b55c8f5444 /sound/soc/codecs/wm8400.c | |
parent | aec0eb50e5f71f6c28cc0a4739b34ec109fe1a56 (diff) |
ASoC: wm8400: Remove the set_cache_io() entirely from ASoC probe.
As we can set the CODEC I/O while snd_soc_register_codec(), so the
calling of set_cache_io() from CODEC ASoC probe could be removed
entirely.
And then we can set the CODEC I/O in the device probe instead of
CODEC ASoC probe as earily as possible.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/wm8400.c')
-rw-r--r-- | sound/soc/codecs/wm8400.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 146564feaea0..e6410f2e8cac 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c | |||
@@ -1318,8 +1318,6 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec) | |||
1318 | priv->wm8400 = wm8400; | 1318 | priv->wm8400 = wm8400; |
1319 | priv->codec = codec; | 1319 | priv->codec = codec; |
1320 | 1320 | ||
1321 | snd_soc_codec_set_cache_io(codec, wm8400->regmap); | ||
1322 | |||
1323 | ret = devm_regulator_bulk_get(wm8400->dev, | 1321 | ret = devm_regulator_bulk_get(wm8400->dev, |
1324 | ARRAY_SIZE(power), &power[0]); | 1322 | ARRAY_SIZE(power), &power[0]); |
1325 | if (ret != 0) { | 1323 | if (ret != 0) { |
@@ -1361,11 +1359,19 @@ static int wm8400_codec_remove(struct snd_soc_codec *codec) | |||
1361 | return 0; | 1359 | return 0; |
1362 | } | 1360 | } |
1363 | 1361 | ||
1362 | struct regmap *wm8400_get_regmap(struct device *dev) | ||
1363 | { | ||
1364 | struct wm8400 *wm8400 = dev_get_platdata(dev); | ||
1365 | |||
1366 | return wm8400->regmap; | ||
1367 | } | ||
1368 | |||
1364 | static struct snd_soc_codec_driver soc_codec_dev_wm8400 = { | 1369 | static struct snd_soc_codec_driver soc_codec_dev_wm8400 = { |
1365 | .probe = wm8400_codec_probe, | 1370 | .probe = wm8400_codec_probe, |
1366 | .remove = wm8400_codec_remove, | 1371 | .remove = wm8400_codec_remove, |
1367 | .suspend = wm8400_suspend, | 1372 | .suspend = wm8400_suspend, |
1368 | .resume = wm8400_resume, | 1373 | .resume = wm8400_resume, |
1374 | .get_regmap = wm8400_get_regmap, | ||
1369 | .set_bias_level = wm8400_set_bias_level, | 1375 | .set_bias_level = wm8400_set_bias_level, |
1370 | 1376 | ||
1371 | .controls = wm8400_snd_controls, | 1377 | .controls = wm8400_snd_controls, |