ASoC: use snd_soc_component_init_regmap() on wm8998
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>
This commit is contained in:
parent
4fbd8d194f
commit
c6766aae8e
|
@ -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 wm8998_priv *priv = snd_soc_codec_get_drvdata(codec);
|
||||||
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(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 snd_soc_component *component = snd_soc_dapm_to_component(dapm);
|
||||||
|
struct arizona *arizona = priv->core.arizona;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
priv->core.arizona->dapm = dapm;
|
arizona->dapm = dapm;
|
||||||
|
snd_soc_codec_init_regmap(codec, arizona->regmap);
|
||||||
|
|
||||||
ret = arizona_init_spk(codec);
|
ret = arizona_init_spk(codec);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
|
@ -1313,17 +1315,9 @@ static unsigned int wm8998_digital_vu[] = {
|
||||||
ARIZONA_DAC_DIGITAL_VOLUME_5R,
|
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 = {
|
static const struct snd_soc_codec_driver soc_codec_dev_wm8998 = {
|
||||||
.probe = wm8998_codec_probe,
|
.probe = wm8998_codec_probe,
|
||||||
.remove = wm8998_codec_remove,
|
.remove = wm8998_codec_remove,
|
||||||
.get_regmap = wm8998_get_regmap,
|
|
||||||
|
|
||||||
.idle_bias_off = true,
|
.idle_bias_off = true,
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue