diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-11-28 09:06:29 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-12-04 20:40:08 +0300 |
| commit | 42e193cdcb9e197e788638bd33bab3d1905815f6 (patch) | |
| tree | 0976e7d31104cbf43bfef1a9ae91de969946f78f /sound/soc/codecs/msm8916-wcd-analog.c | |
| parent | 51f493ae71adc2c49a317a13c38e54e1cdf46005 (diff) | |
| download | linux-42e193cdcb9e197e788638bd33bab3d1905815f6.tar.xz | |
ASoC: use snd_soc_component_init_regmap() on msm8916
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/msm8916-wcd-analog.c')
| -rw-r--r-- | sound/soc/codecs/msm8916-wcd-analog.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c index 066ea2f4ce7b..44062bb7bf2f 100644 --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c @@ -712,6 +712,8 @@ static int pm8916_wcd_analog_probe(struct snd_soc_codec *codec) return err; } + snd_soc_codec_init_regmap(codec, + dev_get_regmap(codec->dev->parent, NULL)); snd_soc_codec_set_drvdata(codec, priv); priv->pmic_rev = snd_soc_read(codec, CDC_D_REVISION1); priv->codec_version = snd_soc_read(codec, CDC_D_PERPH_SUBTYPE); @@ -943,11 +945,6 @@ static int pm8916_wcd_analog_set_jack(struct snd_soc_codec *codec, return 0; } -static struct regmap *pm8916_get_regmap(struct device *dev) -{ - return dev_get_regmap(dev->parent, NULL); -} - static irqreturn_t mbhc_btn_release_irq_handler(int irq, void *arg) { struct pm8916_wcd_analog_priv *priv = arg; @@ -1082,7 +1079,6 @@ static const struct snd_soc_codec_driver pm8916_wcd_analog = { .probe = pm8916_wcd_analog_probe, .remove = pm8916_wcd_analog_remove, .set_jack = pm8916_wcd_analog_set_jack, - .get_regmap = pm8916_get_regmap, .component_driver = { .controls = pm8916_wcd_analog_snd_controls, .num_controls = ARRAY_SIZE(pm8916_wcd_analog_snd_controls), |