diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-11-28 07:06:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-12-04 18:39:55 +0100 |
| commit | 79b4885967cff17e0344b451e8fc4782013f0c9c (patch) | |
| tree | 86ec2cb78f8612523b883fd094c5fe91233ba68d /sound/soc/codecs/88pm860x-codec.c | |
| parent | Linux 4.15-rc1 (diff) | |
| download | linux-79b4885967cff17e0344b451e8fc4782013f0c9c.tar.xz linux-79b4885967cff17e0344b451e8fc4782013f0c9c.zip | |
ASoC: use snd_soc_component_init_regmap() on 88pm860x
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>
Diffstat (limited to 'sound/soc/codecs/88pm860x-codec.c')
| -rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 848c5fe49bc7..be8ea723dff9 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c @@ -1319,6 +1319,7 @@ static int pm860x_probe(struct snd_soc_codec *codec) int i, ret; pm860x->codec = codec; + snd_soc_codec_init_regmap(codec, pm860x->regmap); for (i = 0; i < 4; i++) { ret = request_threaded_irq(pm860x->irq[i], NULL, @@ -1348,18 +1349,10 @@ static int pm860x_remove(struct snd_soc_codec *codec) return 0; } -static struct regmap *pm860x_get_regmap(struct device *dev) -{ - struct pm860x_priv *pm860x = dev_get_drvdata(dev); - - return pm860x->regmap; -} - static const struct snd_soc_codec_driver soc_codec_dev_pm860x = { .probe = pm860x_probe, .remove = pm860x_remove, .set_bias_level = pm860x_set_bias_level, - .get_regmap = pm860x_get_regmap, .component_driver = { .controls = pm860x_snd_controls, |