Skip to content

Commit

Permalink
ASoC: use snd_soc_component_init_regmap() on 88pm860x
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Dec 4, 2017
1 parent 4fbd8d1 commit 79b4885
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions sound/soc/codecs/88pm860x-codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1319,6 +1319,7 @@ static int pm860x_probe(struct snd_soc_codec *codec)
int i, ret;

pm860x->codec = codec;
snd_soc_codec_init_regmap(codec, pm860x->regmap);

for (i = 0; i < 4; i++) {
ret = request_threaded_irq(pm860x->irq[i], NULL,
Expand Down Expand Up @@ -1348,18 +1349,10 @@ static int pm860x_remove(struct snd_soc_codec *codec)
return 0;
}

static struct regmap *pm860x_get_regmap(struct device *dev)
{
struct pm860x_priv *pm860x = dev_get_drvdata(dev);

return pm860x->regmap;
}

static const struct snd_soc_codec_driver soc_codec_dev_pm860x = {
.probe = pm860x_probe,
.remove = pm860x_remove,
.set_bias_level = pm860x_set_bias_level,
.get_regmap = pm860x_get_regmap,

.component_driver = {
.controls = pm860x_snd_controls,
Expand Down

0 comments on commit 79b4885

Please sign in to comment.