ASoC: wm8400: Remove the set_cache_io() entirely from ASoC probe.
authorXiubo Li <Li.Xiubo@freescale.com>
Wed, 26 Mar 2014 05:40:31 +0000 (13:40 +0800)
committerMark Brown <broonie@linaro.org>
Mon, 14 Apr 2014 16:22:20 +0000 (17:22 +0100)
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>
sound/soc/codecs/wm8400.c

index 146564feaea04156d8d0d2fe5608390047b4cad0..e6410f2e8cacde8bd8079834d931c50ad120afab 100644 (file)
@@ -1318,8 +1318,6 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec)
        priv->wm8400 = wm8400;
        priv->codec = codec;
 
-       snd_soc_codec_set_cache_io(codec, wm8400->regmap);
-
        ret = devm_regulator_bulk_get(wm8400->dev,
                                 ARRAY_SIZE(power), &power[0]);
        if (ret != 0) {
@@ -1361,11 +1359,19 @@ static int  wm8400_codec_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
+struct regmap *wm8400_get_regmap(struct device *dev)
+{
+       struct wm8400 *wm8400 = dev_get_platdata(dev);
+
+       return wm8400->regmap;
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_wm8400 = {
        .probe =        wm8400_codec_probe,
        .remove =       wm8400_codec_remove,
        .suspend =      wm8400_suspend,
        .resume =       wm8400_resume,
+       .get_regmap =   wm8400_get_regmap,
        .set_bias_level = wm8400_set_bias_level,
 
        .controls = wm8400_snd_controls,