aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2017-11-28 01:06:15 -0500
committerMark Brown <broonie@kernel.org>2017-12-04 12:39:55 -0500
commit79b4885967cff17e0344b451e8fc4782013f0c9c (patch)
tree86ec2cb78f8612523b883fd094c5fe91233ba68d
parent4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff)
ASoC: use snd_soc_component_init_regmap() on 88pm860x
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/88pm860x-codec.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index 848c5fe49bc7..be8ea723dff9 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -1319,6 +1319,7 @@ static int pm860x_probe(struct snd_soc_codec *codec)
1319 int i, ret; 1319 int i, ret;
1320 1320
1321 pm860x->codec = codec; 1321 pm860x->codec = codec;
1322 snd_soc_codec_init_regmap(codec, pm860x->regmap);
1322 1323
1323 for (i = 0; i < 4; i++) { 1324 for (i = 0; i < 4; i++) {
1324 ret = request_threaded_irq(pm860x->irq[i], NULL, 1325 ret = request_threaded_irq(pm860x->irq[i], NULL,
@@ -1348,18 +1349,10 @@ static int pm860x_remove(struct snd_soc_codec *codec)
1348 return 0; 1349 return 0;
1349} 1350}
1350 1351
1351static struct regmap *pm860x_get_regmap(struct device *dev)
1352{
1353 struct pm860x_priv *pm860x = dev_get_drvdata(dev);
1354
1355 return pm860x->regmap;
1356}
1357
1358static const struct snd_soc_codec_driver soc_codec_dev_pm860x = { 1352static const struct snd_soc_codec_driver soc_codec_dev_pm860x = {
1359 .probe = pm860x_probe, 1353 .probe = pm860x_probe,
1360 .remove = pm860x_remove, 1354 .remove = pm860x_remove,
1361 .set_bias_level = pm860x_set_bias_level, 1355 .set_bias_level = pm860x_set_bias_level,
1362 .get_regmap = pm860x_get_regmap,
1363 1356
1364 .component_driver = { 1357 .component_driver = {
1365 .controls = pm860x_snd_controls, 1358 .controls = pm860x_snd_controls,