1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c
index 44afae0a69ce..cdc1df7fa0e9 100644
--- a/drivers/mfd/rc5t583.c
+++ b/drivers/mfd/rc5t583.c
@@ -75,6 +75,7 @@ static struct deepsleep_control_data deepsleep_data[] = {
         (RC5T583_EXT_PWRREQ1_CONTROL | RC5T583_EXT_PWRREQ2_CONTROL)
 
 static struct mfd_cell rc5t583_subdevs[] = {
+        {.name = "rc5t583-gpio",},
         {.name = "rc5t583-regulator",},
         {.name = "rc5t583-rtc",      },
         {.name = "rc5t583-key",      }
@@ -267,7 +268,7 @@ static int __devinit rc5t583_i2c_probe(struct i2c_client *i2c,
         rc5t583->dev = &i2c->dev;
         i2c_set_clientdata(i2c, rc5t583);
 
-        rc5t583->regmap = regmap_init_i2c(i2c, &rc5t583_regmap_config);
+        rc5t583->regmap = devm_regmap_init_i2c(i2c, &rc5t583_regmap_config);
         if (IS_ERR(rc5t583->regmap)) {
                 ret = PTR_ERR(rc5t583->regmap);
                 dev_err(&i2c->dev, "regmap initialization failed: %d\n", ret);
@@ -276,7 +277,7 @@ static int __devinit rc5t583_i2c_probe(struct i2c_client *i2c,
 
         ret = rc5t583_clear_ext_power_req(rc5t583, pdata);
         if (ret < 0)
-                goto err_irq_init;
+                return ret;
 
         if (i2c->irq) {
                 ret = rc5t583_irq_init(rc5t583, i2c->irq, pdata->irq_base);
@@ -299,8 +300,6 @@ static int __devinit rc5t583_i2c_probe(struct i2c_client *i2c,
 err_add_devs:
         if (irq_init_success)
                 rc5t583_irq_exit(rc5t583);
-err_irq_init:
-        regmap_exit(rc5t583->regmap);
         return ret;
 }
 
@@ -310,7 +309,6 @@ static int  __devexit rc5t583_i2c_remove(struct i2c_client *i2c)
 
         mfd_remove_devices(rc5t583->dev);
         rc5t583_irq_exit(rc5t583);
-        regmap_exit(rc5t583->regmap);
         return 0;
 }