1 files changed, 6 insertions, 26 deletions

diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 991421545b4a..50a5dc7974e1 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1562,35 +1562,25 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi)
 
         spi_set_drvdata(spi, wm8753);
 
-        wm8753->regmap = regmap_init_spi(spi, &wm8753_regmap);
+        wm8753->regmap = devm_regmap_init_spi(spi, &wm8753_regmap);
         if (IS_ERR(wm8753->regmap)) {
                 ret = PTR_ERR(wm8753->regmap);
                 dev_err(&spi->dev, "Failed to allocate register map: %d\n",
                         ret);
-                goto err;
+                return ret;
         }
 
         ret = snd_soc_register_codec(&spi->dev, &soc_codec_dev_wm8753,
                                      wm8753_dai, ARRAY_SIZE(wm8753_dai));
-        if (ret != 0) {
+        if (ret != 0)
                 dev_err(&spi->dev, "Failed to register CODEC: %d\n", ret);
-                goto err_regmap;
-        }
 
-        return 0;
-
-err_regmap:
-        regmap_exit(wm8753->regmap);
-err:
         return ret;
 }
 
 static int __devexit wm8753_spi_remove(struct spi_device *spi)
 {
-        struct wm8753_priv *wm8753 = spi_get_drvdata(spi);
-
         snd_soc_unregister_codec(&spi->dev);
-        regmap_exit(wm8753->regmap);
         return 0;
 }
 
@@ -1619,35 +1609,25 @@ static __devinit int wm8753_i2c_probe(struct i2c_client *i2c,
 
         i2c_set_clientdata(i2c, wm8753);
 
-        wm8753->regmap = regmap_init_i2c(i2c, &wm8753_regmap);
+        wm8753->regmap = devm_regmap_init_i2c(i2c, &wm8753_regmap);
         if (IS_ERR(wm8753->regmap)) {
                 ret = PTR_ERR(wm8753->regmap);
                 dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
                         ret);
-                goto err;
+                return ret;
         }
 
         ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8753,
                                      wm8753_dai, ARRAY_SIZE(wm8753_dai));
-        if (ret != 0) {
+        if (ret != 0)
                 dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);
-                goto err_regmap;
-        }
 
-        return 0;
-
-err_regmap:
-        regmap_exit(wm8753->regmap);
-err:
         return ret;
 }
 
 static __devexit int wm8753_i2c_remove(struct i2c_client *client)
 {
-        struct wm8753_priv *wm8753 = i2c_get_clientdata(client);
-
         snd_soc_unregister_codec(&client->dev);
-        regmap_exit(wm8753->regmap);
         return 0;
 }