From: Axel Lin Date: Tue, 3 Sep 2013 06:27:56 +0000 (+0800) Subject: regulator: fan53555: Convert to devm_regulator_register X-Git-Tag: upstream/snapshot3+hdmi~4013^2~23^2~35 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b15f5f7603fe9963e2201874f6e6c6cc0410b4d1;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git regulator: fan53555: Convert to devm_regulator_register Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c index 70b7220..7ca3d9e 100644 --- a/drivers/regulator/fan53555.c +++ b/drivers/regulator/fan53555.c @@ -218,9 +218,8 @@ static int fan53555_regulator_register(struct fan53555_device_info *di, rdesc->vsel_mask = VSEL_NSEL_MASK; rdesc->owner = THIS_MODULE; - di->rdev = regulator_register(&di->desc, config); + di->rdev = devm_regulator_register(di->dev, &di->desc, config); return PTR_ERR_OR_ZERO(di->rdev); - } static struct regmap_config fan53555_regmap_config = { @@ -291,14 +290,6 @@ static int fan53555_regulator_probe(struct i2c_client *client, } -static int fan53555_regulator_remove(struct i2c_client *client) -{ - struct fan53555_device_info *di = i2c_get_clientdata(client); - - regulator_unregister(di->rdev); - return 0; -} - static const struct i2c_device_id fan53555_id[] = { {"fan53555", -1}, { }, @@ -309,7 +300,6 @@ static struct i2c_driver fan53555_regulator_driver = { .name = "fan53555-regulator", }, .probe = fan53555_regulator_probe, - .remove = fan53555_regulator_remove, .id_table = fan53555_id, };