diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-11-28 01:05:31 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-12-04 12:37:57 -0500 |
commit | 33953d851d37f8b62b96d70fdccd35b62dffebe8 (patch) | |
tree | 107c59e8d3d3fbc799a19c8c15bfbfb12edd2c24 | |
parent | 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff) |
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>
-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) | |||
610 | { | 610 | { |
611 | struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec); | 611 | struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec); |
612 | 612 | ||
613 | snd_soc_codec_init_regmap(codec, | ||
614 | dev_get_regmap(codec->dev->parent, NULL)); | ||
615 | |||
613 | /* these are the reset values */ | 616 | /* these are the reset values */ |
614 | mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_RX0, 0x25893); | 617 | mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_RX0, 0x25893); |
615 | mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_RX1, 0x00d35A); | 618 | mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_RX1, 0x00d35A); |
@@ -728,15 +731,9 @@ static struct snd_soc_dai_driver mc13783_dai_sync[] = { | |||
728 | } | 731 | } |
729 | }; | 732 | }; |
730 | 733 | ||
731 | static struct regmap *mc13783_get_regmap(struct device *dev) | ||
732 | { | ||
733 | return dev_get_regmap(dev->parent, NULL); | ||
734 | } | ||
735 | |||
736 | static const struct snd_soc_codec_driver soc_codec_dev_mc13783 = { | 734 | static const struct snd_soc_codec_driver soc_codec_dev_mc13783 = { |
737 | .probe = mc13783_probe, | 735 | .probe = mc13783_probe, |
738 | .remove = mc13783_remove, | 736 | .remove = mc13783_remove, |
739 | .get_regmap = mc13783_get_regmap, | ||
740 | .component_driver = { | 737 | .component_driver = { |
741 | .controls = mc13783_control_list, | 738 | .controls = mc13783_control_list, |
742 | .num_controls = ARRAY_SIZE(mc13783_control_list), | 739 | .num_controls = ARRAY_SIZE(mc13783_control_list), |