diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-11-28 01:04:02 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-12-04 12:31:56 -0500 |
commit | 5a81eb5356c87ad60f65378464ba92a7d645ce1d (patch) | |
tree | c3c7b6fabb17eb334bf7027d622c87033084f100 | |
parent | 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff) |
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/wm8994.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index f91b49e1ece3..21ffd6403173 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
@@ -3993,6 +3993,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) | |||
3993 | unsigned int reg; | 3993 | unsigned int reg; |
3994 | int ret, i; | 3994 | int ret, i; |
3995 | 3995 | ||
3996 | snd_soc_codec_init_regmap(codec, control->regmap); | ||
3997 | |||
3996 | wm8994->hubs.codec = codec; | 3998 | wm8994->hubs.codec = codec; |
3997 | 3999 | ||
3998 | mutex_init(&wm8994->accdet_lock); | 4000 | mutex_init(&wm8994->accdet_lock); |
@@ -4434,19 +4436,11 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec) | |||
4434 | return 0; | 4436 | return 0; |
4435 | } | 4437 | } |
4436 | 4438 | ||
4437 | static struct regmap *wm8994_get_regmap(struct device *dev) | ||
4438 | { | ||
4439 | struct wm8994 *control = dev_get_drvdata(dev->parent); | ||
4440 | |||
4441 | return control->regmap; | ||
4442 | } | ||
4443 | |||
4444 | static const struct snd_soc_codec_driver soc_codec_dev_wm8994 = { | 4439 | static const struct snd_soc_codec_driver soc_codec_dev_wm8994 = { |
4445 | .probe = wm8994_codec_probe, | 4440 | .probe = wm8994_codec_probe, |
4446 | .remove = wm8994_codec_remove, | 4441 | .remove = wm8994_codec_remove, |
4447 | .suspend = wm8994_codec_suspend, | 4442 | .suspend = wm8994_codec_suspend, |
4448 | .resume = wm8994_codec_resume, | 4443 | .resume = wm8994_codec_resume, |
4449 | .get_regmap = wm8994_get_regmap, | ||
4450 | .set_bias_level = wm8994_set_bias_level, | 4444 | .set_bias_level = wm8994_set_bias_level, |
4451 | }; | 4445 | }; |
4452 | 4446 | ||