1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/regulator/da9210-regulator.c b/drivers/regulator/da9210-regulator.c
index f7ccff14f763..6f5ecbe1132e 100644
--- a/drivers/regulator/da9210-regulator.c
+++ b/drivers/regulator/da9210-regulator.c
@@ -155,7 +155,7 @@ static int da9210_i2c_probe(struct i2c_client *i2c,
         config.regmap = chip->regmap;
         config.of_node = dev->of_node;
 
-        rdev = regulator_register(&da9210_reg, &config);
+        rdev = devm_regulator_register(&i2c->dev, &da9210_reg, &config);
         if (IS_ERR(rdev)) {
                 dev_err(&i2c->dev, "Failed to register DA9210 regulator\n");
                 return PTR_ERR(rdev);
@@ -168,13 +168,6 @@ static int da9210_i2c_probe(struct i2c_client *i2c,
         return 0;
 }
 
-static int da9210_i2c_remove(struct i2c_client *i2c)
-{
-        struct da9210 *chip = i2c_get_clientdata(i2c);
-        regulator_unregister(chip->rdev);
-        return 0;
-}
-
 static const struct i2c_device_id da9210_i2c_id[] = {
         {"da9210", 0},
         {},
@@ -188,7 +181,6 @@ static struct i2c_driver da9210_regulator_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = da9210_i2c_probe,
-        .remove = da9210_i2c_remove,
         .id_table = da9210_i2c_id,
 };