diff options
| author | Kuninori Morimoto | 2017-11-28 07:05:31 +0100 |
|---|---|---|
| committer | Mark Brown | 2017-12-04 18:37:57 +0100 |
| commit | 33953d851d37f8b62b96d70fdccd35b62dffebe8 (patch) | |
| tree | 107c59e8d3d3fbc799a19c8c15bfbfb12edd2c24 /sound/soc/codecs/mc13783.c | |
| parent | Linux 4.15-rc1 (diff) | |
| download | kernel-qcow2-linux-33953d851d37f8b62b96d70fdccd35b62dffebe8.tar.gz kernel-qcow2-linux-33953d851d37f8b62b96d70fdccd35b62dffebe8.tar.xz kernel-qcow2-linux-33953d851d37f8b62b96d70fdccd35b62dffebe8.zip | |
ASoC: use snd_soc_component_init_regmap() on mc13783
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/mc13783.c')
| -rw-r--r-- | sound/soc/codecs/mc13783.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index 4fd8d1dc4eef..be7a45f05bbf 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c @@ -610,6 +610,9 @@ static int mc13783_probe(struct snd_soc_codec *codec) { struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec); + snd_soc_codec_init_regmap(codec, + dev_get_regmap(codec->dev->parent, NULL)); + /* these are the reset values */ mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_RX0, 0x25893); mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_RX1, 0x00d35A); @@ -728,15 +731,9 @@ static struct snd_soc_dai_driver mc13783_dai_sync[] = { } }; -static struct regmap *mc13783_get_regmap(struct device *dev) -{ - return dev_get_regmap(dev->parent, NULL); -} - static const struct snd_soc_codec_driver soc_codec_dev_mc13783 = { .probe = mc13783_probe, .remove = mc13783_remove, - .get_regmap = mc13783_get_regmap, .component_driver = { .controls = mc13783_control_list, .num_controls = ARRAY_SIZE(mc13783_control_list), |