ASoC: use snd_soc_component_init_regmap() on wm8350
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 28 Nov 2017 06:04:31 +0000 (06:04 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 4 Dec 2017 17:32:31 +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/wm8350.c

index 2efc5b41ad0fe32f138384e91462af562e627a7d..fc79c6725d06f93f26efcb3eaf56eba70e872b6a 100644 (file)
@@ -1472,6 +1472,8 @@ static  int wm8350_codec_probe(struct snd_soc_codec *codec)
                            GFP_KERNEL);
        if (priv == NULL)
                return -ENOMEM;
                            GFP_KERNEL);
        if (priv == NULL)
                return -ENOMEM;
+
+       snd_soc_codec_init_regmap(codec, wm8350->regmap);
        snd_soc_codec_set_drvdata(codec, priv);
 
        priv->wm8350 = wm8350;
        snd_soc_codec_set_drvdata(codec, priv);
 
        priv->wm8350 = wm8350;
@@ -1580,17 +1582,9 @@ static int  wm8350_codec_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
        return 0;
 }
 
-static struct regmap *wm8350_get_regmap(struct device *dev)
-{
-       struct wm8350 *wm8350 = dev_get_platdata(dev);
-
-       return wm8350->regmap;
-}
-
 static const struct snd_soc_codec_driver soc_codec_dev_wm8350 = {
        .probe =        wm8350_codec_probe,
        .remove =       wm8350_codec_remove,
 static const struct snd_soc_codec_driver soc_codec_dev_wm8350 = {
        .probe =        wm8350_codec_probe,
        .remove =       wm8350_codec_remove,
-       .get_regmap =   wm8350_get_regmap,
        .set_bias_level = wm8350_set_bias_level,
        .suspend_bias_off = true,
 
        .set_bias_level = wm8350_set_bias_level,
        .suspend_bias_off = true,