2 files changed, 4 insertions, 18 deletions

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index ce785f481281..b4a445e7f78d 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -384,7 +384,7 @@ config REGULATOR_PCF50633
          on PCF50633
 
 config REGULATOR_PFUZE100
-        tristate "Support regulators on Freescale PFUZE100 PMIC"
+        tristate "Freescale PFUZE100 regulator driver"
         depends on I2C
         select REGMAP_I2C
         help
diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
index 8b5e4c712a01..0c511ae52c42 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -408,31 +408,18 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
                 config.driver_data = pfuze_chip;
                 config.of_node = match_of_node(i);
 
-                pfuze_chip->regulators[i] = regulator_register(desc, &config);
+                pfuze_chip->regulators[i] =
+                        devm_regulator_register(&client->dev, desc, &config);
                 if (IS_ERR(pfuze_chip->regulators[i])) {
                         dev_err(&client->dev, "register regulator%s failed\n",
                                 pfuze100_regulators[i].desc.name);
-                        ret = PTR_ERR(pfuze_chip->regulators[i]);
-                        while (--i >= 0)
-                                regulator_unregister(pfuze_chip->regulators[i]);
-                        return ret;
+                        return PTR_ERR(pfuze_chip->regulators[i]);
                 }
         }
 
         return 0;
 }
 
-static int pfuze100_regulator_remove(struct i2c_client *client)
-{
-        int i;
-        struct pfuze_chip *pfuze_chip = i2c_get_clientdata(client);
-
-        for (i = 0; i < PFUZE100_MAX_REGULATOR; i++)
-                regulator_unregister(pfuze_chip->regulators[i]);
-
-        return 0;
-}
-
 static struct i2c_driver pfuze_driver = {
         .id_table = pfuze_device_id,
         .driver = {
@@ -441,7 +428,6 @@ static struct i2c_driver pfuze_driver = {
                 .of_match_table = pfuze_dt_ids,
         },
         .probe = pfuze100_regulator_probe,
-        .remove = pfuze100_regulator_remove,
 };
 module_i2c_driver(pfuze_driver);