aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/da7210.c
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-12-03 03:13:43 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-03 03:24:51 -0500
commitff7dc6af1319b49c75a947f1fc7ec51368d03e9a (patch)
tree27b769ceebf46528476856337d39010d41be3280 /sound/soc/codecs/da7210.c
parent4e75955d8fcc59813483bab0c80473c8c4a6f04a (diff)
ASoC: da7210: Remove unnecessary regmap_exit call
Use of devm_regmap_init_spi does not require an explicit regmap_exit call. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/da7210.c')
-rw-r--r--sound/soc/codecs/da7210.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index ab1ee5b734db..843c1eb72faf 100644
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -1337,24 +1337,15 @@ static int __devinit da7210_spi_probe(struct spi_device *spi)
1337 if (ret != 0) 1337 if (ret != 0)
1338 dev_warn(&spi->dev, "Failed to apply regmap patch: %d\n", ret); 1338 dev_warn(&spi->dev, "Failed to apply regmap patch: %d\n", ret);
1339 1339
1340 ret = snd_soc_register_codec(&spi->dev, 1340 ret = snd_soc_register_codec(&spi->dev,
1341 &soc_codec_dev_da7210, &da7210_dai, 1); 1341 &soc_codec_dev_da7210, &da7210_dai, 1);
1342 if (ret < 0)
1343 goto err_regmap;
1344
1345 return ret;
1346
1347err_regmap:
1348 regmap_exit(da7210->regmap);
1349 1342
1350 return ret; 1343 return ret;
1351} 1344}
1352 1345
1353static int __devexit da7210_spi_remove(struct spi_device *spi) 1346static int __devexit da7210_spi_remove(struct spi_device *spi)
1354{ 1347{
1355 struct da7210_priv *da7210 = spi_get_drvdata(spi);
1356 snd_soc_unregister_codec(&spi->dev); 1348 snd_soc_unregister_codec(&spi->dev);
1357 regmap_exit(da7210->regmap);
1358 return 0; 1349 return 0;
1359} 1350}
1360 1351