ASoC: use snd_soc_component_init_regmap() on wm8400
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 28 Nov 2017 06:04:17 +0000 (06:04 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 4 Dec 2017 17:32:13 +0000 (17:32 +0000)
To setup regmap, ALSA SoC has snd_soc_component_init_regmap() and
.get_regmap. But these are duplicated feature.
Let's use snd_soc_component_init_regmap() and remove .get_regmap

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wm8400.c

index 6c59fb933bd6a940571fdccd8f3b4af765f7d256..a36adf881bcae8f40df5e7b805ebda6c90f9a7e5 100644 (file)
@@ -1285,6 +1285,7 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec)
        if (priv == NULL)
                return -ENOMEM;
 
+       snd_soc_codec_init_regmap(codec, wm8400->regmap);
        snd_soc_codec_set_drvdata(codec, priv);
        priv->wm8400 = wm8400;
 
@@ -1325,17 +1326,9 @@ static int  wm8400_codec_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
-static struct regmap *wm8400_get_regmap(struct device *dev)
-{
-       struct wm8400 *wm8400 = dev_get_platdata(dev);
-
-       return wm8400->regmap;
-}
-
 static const struct snd_soc_codec_driver soc_codec_dev_wm8400 = {
        .probe =        wm8400_codec_probe,
        .remove =       wm8400_codec_remove,
-       .get_regmap =   wm8400_get_regmap,
        .set_bias_level = wm8400_set_bias_level,
        .suspend_bias_off = true,