diff options
-rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index b07e17160f94..dc9e6b94e645 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c | |||
@@ -1327,10 +1327,6 @@ static int pm860x_probe(struct snd_soc_codec *codec) | |||
1327 | 1327 | ||
1328 | pm860x->codec = codec; | 1328 | pm860x->codec = codec; |
1329 | 1329 | ||
1330 | ret = snd_soc_codec_set_cache_io(codec, pm860x->regmap); | ||
1331 | if (ret) | ||
1332 | return ret; | ||
1333 | |||
1334 | for (i = 0; i < 4; i++) { | 1330 | for (i = 0; i < 4; i++) { |
1335 | ret = request_threaded_irq(pm860x->irq[i], NULL, | 1331 | ret = request_threaded_irq(pm860x->irq[i], NULL, |
1336 | pm860x_codec_handler, IRQF_ONESHOT, | 1332 | pm860x_codec_handler, IRQF_ONESHOT, |
@@ -1362,10 +1358,18 @@ static int pm860x_remove(struct snd_soc_codec *codec) | |||
1362 | return 0; | 1358 | return 0; |
1363 | } | 1359 | } |
1364 | 1360 | ||
1361 | struct regmap *pm860x_get_regmap(struct device *dev) | ||
1362 | { | ||
1363 | struct pm860x_priv *pm860x = dev_get_drvdata(dev); | ||
1364 | |||
1365 | return pm860x->regmap; | ||
1366 | } | ||
1367 | |||
1365 | static struct snd_soc_codec_driver soc_codec_dev_pm860x = { | 1368 | static struct snd_soc_codec_driver soc_codec_dev_pm860x = { |
1366 | .probe = pm860x_probe, | 1369 | .probe = pm860x_probe, |
1367 | .remove = pm860x_remove, | 1370 | .remove = pm860x_remove, |
1368 | .set_bias_level = pm860x_set_bias_level, | 1371 | .set_bias_level = pm860x_set_bias_level, |
1372 | .get_regmap = pm860x_get_regmap, | ||
1369 | 1373 | ||
1370 | .controls = pm860x_snd_controls, | 1374 | .controls = pm860x_snd_controls, |
1371 | .num_controls = ARRAY_SIZE(pm860x_snd_controls), | 1375 | .num_controls = ARRAY_SIZE(pm860x_snd_controls), |