Commit 5a81eb53 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: use snd_soc_component_init_regmap() on wm8994

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
...@@ -3993,6 +3993,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) ...@@ -3993,6 +3993,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
unsigned int reg; unsigned int reg;
int ret, i; int ret, i;
snd_soc_codec_init_regmap(codec, control->regmap);
wm8994->hubs.codec = codec; wm8994->hubs.codec = codec;
mutex_init(&wm8994->accdet_lock); mutex_init(&wm8994->accdet_lock);
...@@ -4434,19 +4436,11 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec) ...@@ -4434,19 +4436,11 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec)
return 0; return 0;
} }
static struct regmap *wm8994_get_regmap(struct device *dev)
{
struct wm8994 *control = dev_get_drvdata(dev->parent);
return control->regmap;
}
static const struct snd_soc_codec_driver soc_codec_dev_wm8994 = { static const struct snd_soc_codec_driver soc_codec_dev_wm8994 = {
.probe = wm8994_codec_probe, .probe = wm8994_codec_probe,
.remove = wm8994_codec_remove, .remove = wm8994_codec_remove,
.suspend = wm8994_codec_suspend, .suspend = wm8994_codec_suspend,
.resume = wm8994_codec_resume, .resume = wm8994_codec_resume,
.get_regmap = wm8994_get_regmap,
.set_bias_level = wm8994_set_bias_level, .set_bias_level = wm8994_set_bias_level,
}; };
......
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