diff options
author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-03-26 01:40:30 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-14 12:22:19 -0400 |
commit | aec0eb50e5f71f6c28cc0a4739b34ec109fe1a56 (patch) | |
tree | 90b1d2c9851debfe6be1fd9b9bb1b1474885b2a9 /sound/soc/codecs/wm8350.c | |
parent | 6e4842d30c2eea928b6df6adfe9db49ec971f32d (diff) |
ASoC: wm8350: 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/wm8350.c')
-rw-r--r-- | sound/soc/codecs/wm8350.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 757256bf7672..6b31a9f83137 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c | |||
@@ -1505,8 +1505,6 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) | |||
1505 | if (ret != 0) | 1505 | if (ret != 0) |
1506 | return ret; | 1506 | return ret; |
1507 | 1507 | ||
1508 | snd_soc_codec_set_cache_io(codec, wm8350->regmap); | ||
1509 | |||
1510 | /* Put the codec into reset if it wasn't already */ | 1508 | /* Put the codec into reset if it wasn't already */ |
1511 | wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA); | 1509 | wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA); |
1512 | 1510 | ||
@@ -1608,11 +1606,19 @@ static int wm8350_codec_remove(struct snd_soc_codec *codec) | |||
1608 | return 0; | 1606 | return 0; |
1609 | } | 1607 | } |
1610 | 1608 | ||
1609 | struct regmap *wm8350_get_regmap(struct device *dev) | ||
1610 | { | ||
1611 | struct wm8350 *wm8350 = dev_get_platdata(dev); | ||
1612 | |||
1613 | return wm8350->regmap; | ||
1614 | } | ||
1615 | |||
1611 | static struct snd_soc_codec_driver soc_codec_dev_wm8350 = { | 1616 | static struct snd_soc_codec_driver soc_codec_dev_wm8350 = { |
1612 | .probe = wm8350_codec_probe, | 1617 | .probe = wm8350_codec_probe, |
1613 | .remove = wm8350_codec_remove, | 1618 | .remove = wm8350_codec_remove, |
1614 | .suspend = wm8350_suspend, | 1619 | .suspend = wm8350_suspend, |
1615 | .resume = wm8350_resume, | 1620 | .resume = wm8350_resume, |
1621 | .get_regmap = wm8350_get_regmap, | ||
1616 | .set_bias_level = wm8350_set_bias_level, | 1622 | .set_bias_level = wm8350_set_bias_level, |
1617 | 1623 | ||
1618 | .controls = wm8350_snd_controls, | 1624 | .controls = wm8350_snd_controls, |