Commit 893d7cbe authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: use snd_soc_component_init_regmap() on wm5110

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4fbd8d19
...@@ -2280,9 +2280,11 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) ...@@ -2280,9 +2280,11 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec); struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec);
struct arizona *arizona = priv->core.arizona;
int i, ret; int i, ret;
priv->core.arizona->dapm = dapm; arizona->dapm = dapm;
snd_soc_codec_init_regmap(codec, arizona->regmap);
ret = arizona_init_spk(codec); ret = arizona_init_spk(codec);
if (ret < 0) if (ret < 0)
...@@ -2344,17 +2346,9 @@ static unsigned int wm5110_digital_vu[] = { ...@@ -2344,17 +2346,9 @@ static unsigned int wm5110_digital_vu[] = {
ARIZONA_DAC_DIGITAL_VOLUME_6R, ARIZONA_DAC_DIGITAL_VOLUME_6R,
}; };
static struct regmap *wm5110_get_regmap(struct device *dev)
{
struct wm5110_priv *priv = dev_get_drvdata(dev);
return priv->core.arizona->regmap;
}
static const struct snd_soc_codec_driver soc_codec_dev_wm5110 = { static const struct snd_soc_codec_driver soc_codec_dev_wm5110 = {
.probe = wm5110_codec_probe, .probe = wm5110_codec_probe,
.remove = wm5110_codec_remove, .remove = wm5110_codec_remove,
.get_regmap = wm5110_get_regmap,
.idle_bias_off = true, .idle_bias_off = true,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment