]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: cq93vc: Remove the set_cache_io() entirely from ASoC probe.
authorXiubo Li <Li.Xiubo@freescale.com>
Wed, 26 Mar 2014 05:40:25 +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>
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/codecs/cq93vc.c

index 1e25c7af853bcdb7c40b7c94d4cb2ca6e878b8be..5e5518d203119e3cdd53ffa7cc07e1a8adf6e298 100644 (file)
@@ -139,8 +139,6 @@ static int cq93vc_probe(struct snd_soc_codec *codec)
 
        davinci_vc->cq93vc.codec = codec;
 
-       snd_soc_codec_set_cache_io(codec, davinci_vc->regmap);
-
        /* Off, with power on */
        cq93vc_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
@@ -154,11 +152,19 @@ static int cq93vc_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
+struct regmap *cq93vc_get_regmap(struct device *dev)
+{
+       struct davinci_vc *davinci_vc = codec->dev->platform_data;
+
+       return davinci_vc->regmap;
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_cq93vc = {
        .set_bias_level = cq93vc_set_bias_level,
        .probe = cq93vc_probe,
        .remove = cq93vc_remove,
        .resume = cq93vc_resume,
+       .get_regmap = cq93vc_get_regmap,
        .controls = cq93vc_snd_controls,
        .num_controls = ARRAY_SIZE(cq93vc_snd_controls),
 };