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

index 757256bf7672ef9a44d156d895ca0537018ab852..6b31a9f831371a468632045b53570cfe8f7fbc2e 100644 (file)
@@ -1505,8 +1505,6 @@ static  int wm8350_codec_probe(struct snd_soc_codec *codec)
        if (ret != 0)
                return ret;
 
-       snd_soc_codec_set_cache_io(codec, wm8350->regmap);
-
        /* Put the codec into reset if it wasn't already */
        wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA);
 
@@ -1608,11 +1606,19 @@ static int  wm8350_codec_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
+struct regmap *wm8350_get_regmap(struct device *dev)
+{
+       struct wm8350 *wm8350 = dev_get_platdata(dev);
+
+       return wm8350->regmap;
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_wm8350 = {
        .probe =        wm8350_codec_probe,
        .remove =       wm8350_codec_remove,
        .suspend =      wm8350_suspend,
        .resume =       wm8350_resume,
+       .get_regmap =   wm8350_get_regmap,
        .set_bias_level = wm8350_set_bias_level,
 
        .controls = wm8350_snd_controls,