diff options
| author |   Mark Brown <broonie@kernel.org> | 2018-01-26 15:27:56 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-26 15:27:56 +0000 |
| commit | e0a663f24d532c7ad9ff34cc1aa96bf94c75ef44 (patch) | |
| tree | bd55409a2257083c3be051a3bdc7c6d1e7c64773 | |
| parent | Merge remote-tracking branches 'asoc/topic/wm8350', 'asoc/topic/wm8400', 'asoc/topic/wm8903', 'asoc/topic/wm8994' and 'asoc/topic/wm8997' into asoc-next (diff) | |
| parent | ASoC: use snd_soc_component_init_regmap() on wm8998 (diff) | |
| download | linux-dev-e0a663f24d532c7ad9ff34cc1aa96bf94c75ef44.tar.xz linux-dev-e0a663f24d532c7ad9ff34cc1aa96bf94c75ef44.zip | |
Merge remote-tracking branch 'asoc/topic/wm8998' into asoc-next
| -rw-r--r-- | sound/soc/codecs/wm8998.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c index 2d211dbe7422..1288e1f67dcf 100644 --- a/sound/soc/codecs/wm8998.c +++ b/sound/soc/codecs/wm8998.c @@ -1275,9 +1275,11 @@ static int wm8998_codec_probe(struct snd_soc_codec *codec) struct wm8998_priv *priv = snd_soc_codec_get_drvdata(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); + struct arizona *arizona = priv->core.arizona; int ret; - priv->core.arizona->dapm = dapm; + arizona->dapm = dapm; + snd_soc_codec_init_regmap(codec, arizona->regmap); ret = arizona_init_spk(codec); if (ret < 0) @@ -1313,17 +1315,9 @@ static unsigned int wm8998_digital_vu[] = { ARIZONA_DAC_DIGITAL_VOLUME_5R, }; -static struct regmap *wm8998_get_regmap(struct device *dev) -{ - struct wm8998_priv *priv = dev_get_drvdata(dev); - - return priv->core.arizona->regmap; -} - static const struct snd_soc_codec_driver soc_codec_dev_wm8998 = { .probe = wm8998_codec_probe, .remove = wm8998_codec_remove, - .get_regmap = wm8998_get_regmap, .idle_bias_off = true, |