1 files changed, 12 insertions, 20 deletions

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index ce6720073798..bd4b0db4cdaa 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3588,8 +3588,8 @@ static const struct regmap_config wm8962_regmap = {
         .cache_type = REGCACHE_RBTREE,
 };
 
-static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
-                                      const struct i2c_device_id *id)
+static int wm8962_i2c_probe(struct i2c_client *i2c,
+                            const struct i2c_device_id *id)
 {
         struct wm8962_pdata *pdata = dev_get_platdata(&i2c->dev);
         struct wm8962_priv *wm8962;
@@ -3610,7 +3610,7 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
         for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++)
                 wm8962->supplies[i].supply = wm8962_supply_names[i];
 
-        ret = regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8962->supplies),
+        ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8962->supplies),
                                  wm8962->supplies);
         if (ret != 0) {
                 dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
@@ -3621,10 +3621,10 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
                                     wm8962->supplies);
         if (ret != 0) {
                 dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret);
-                goto err_get;
+                return ret;
         }
 
-        wm8962->regmap = regmap_init_i2c(i2c, &wm8962_regmap);
+        wm8962->regmap = devm_regmap_init_i2c(i2c, &wm8962_regmap);
         if (IS_ERR(wm8962->regmap)) {
                 ret = PTR_ERR(wm8962->regmap);
                 dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret);
@@ -3641,20 +3641,20 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
         ret = regmap_read(wm8962->regmap, WM8962_SOFTWARE_RESET, &reg);
         if (ret < 0) {
                 dev_err(&i2c->dev, "Failed to read ID register\n");
-                goto err_regmap;
+                goto err_enable;
         }
         if (reg != 0x6243) {
                 dev_err(&i2c->dev,
                         "Device is not a WM8962, ID %x != 0x6243\n", reg);
                 ret = -EINVAL;
-                goto err_regmap;
+                goto err_enable;
         }
 
         ret = regmap_read(wm8962->regmap, WM8962_RIGHT_INPUT_VOLUME, &reg);
         if (ret < 0) {
                 dev_err(&i2c->dev, "Failed to read device revision: %d\n",
                         ret);
-                goto err_regmap;
+                goto err_enable;
         }
 
         dev_info(&i2c->dev, "customer id %x revision %c\n",
@@ -3667,7 +3667,7 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
         ret = wm8962_reset(wm8962);
         if (ret < 0) {
                 dev_err(&i2c->dev, "Failed to issue reset\n");
-                goto err_regmap;
+                goto err_enable;
         }
 
         if (pdata && pdata->in4_dc_measure) {
@@ -3686,30 +3686,22 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
         ret = snd_soc_register_codec(&i2c->dev,
                                      &soc_codec_dev_wm8962, &wm8962_dai, 1);
         if (ret < 0)
-                goto err_regmap;
+                goto err_enable;
 
         /* The drivers should power up as needed */
         regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
 
         return 0;
 
-err_regmap:
-        regmap_exit(wm8962->regmap);
 err_enable:
         regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
-err_get:
-        regulator_bulk_free(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
 err:
         return ret;
 }
 
-static __devexit int wm8962_i2c_remove(struct i2c_client *client)
+static int wm8962_i2c_remove(struct i2c_client *client)
 {
-        struct wm8962_priv *wm8962 = dev_get_drvdata(&client->dev);
-
         snd_soc_unregister_codec(&client->dev);
-        regmap_exit(wm8962->regmap);
-        regulator_bulk_free(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
         return 0;
 }
 
@@ -3773,7 +3765,7 @@ static struct i2c_driver wm8962_i2c_driver = {
                 .pm = &wm8962_pm,
         },
         .probe =    wm8962_i2c_probe,
-        .remove =   __devexit_p(wm8962_i2c_remove),
+        .remove =   wm8962_i2c_remove,
         .id_table = wm8962_i2c_id,
 };