Merge remote-tracking branch 'trivial/for-next'

[karo-tx-linux.git] / drivers / regulator / tps51632-regulator.c

diff --git a/drivers/regulator/tps51632-regulator.c b/drivers/regulator/tps51632-regulator.c
index 9392a7ca3d2dc6df9152cb1aeb13c776b856e253..b0a3f0917a27ea841f3fffefdda7b67b163e8168 100644 (file)
--- a/drivers/regulator/tps51632-regulator.c
+++ b/drivers/regulator/tps51632-regulator.c
@@ -343,7 +343,7 @@ static int tps51632_probe(struct i2c_client *client,
        config.regmap = tps->regmap;
        config.of_node = client->dev.of_node;
 
-       rdev = regulator_register(&tps->desc, &config);
+       rdev = devm_regulator_register(&client->dev, &tps->desc, &config);
        if (IS_ERR(rdev)) {
                dev_err(tps->dev, "regulator register failed\n");
                return PTR_ERR(rdev);
@@ -353,14 +353,6 @@ static int tps51632_probe(struct i2c_client *client,
        return 0;
 }
 
-static int tps51632_remove(struct i2c_client *client)
-{
-       struct tps51632_chip *tps = i2c_get_clientdata(client);
-
-       regulator_unregister(tps->rdev);
-       return 0;
-}
-
 static const struct i2c_device_id tps51632_id[] = {
        {.name = "tps51632",},
        {},
@@ -375,7 +367,6 @@ static struct i2c_driver tps51632_i2c_driver = {
                .of_match_table = of_match_ptr(tps51632_of_match),
        },
        .probe = tps51632_probe,
-       .remove = tps51632_remove,
        .id_table = tps51632_id,
 };