Commit a47df97c authored by Sachin Kamat's avatar Sachin Kamat Committed by Bryan Wu

leds-lm3530: Use devm_regulator_get function

Device managed functions are already used in this file.
Hence convert regulator_get() too to use it.
Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarBryan Wu <bryan.wu@canonical.com>
parent 8fe4554f
...@@ -416,7 +416,7 @@ static int __devinit lm3530_probe(struct i2c_client *client, ...@@ -416,7 +416,7 @@ static int __devinit lm3530_probe(struct i2c_client *client,
i2c_set_clientdata(client, drvdata); i2c_set_clientdata(client, drvdata);
drvdata->regulator = regulator_get(&client->dev, "vin"); drvdata->regulator = devm_regulator_get(&client->dev, "vin");
if (IS_ERR(drvdata->regulator)) { if (IS_ERR(drvdata->regulator)) {
dev_err(&client->dev, "regulator get failed\n"); dev_err(&client->dev, "regulator get failed\n");
err = PTR_ERR(drvdata->regulator); err = PTR_ERR(drvdata->regulator);
...@@ -429,15 +429,13 @@ static int __devinit lm3530_probe(struct i2c_client *client, ...@@ -429,15 +429,13 @@ static int __devinit lm3530_probe(struct i2c_client *client,
if (err < 0) { if (err < 0) {
dev_err(&client->dev, dev_err(&client->dev,
"Register Init failed: %d\n", err); "Register Init failed: %d\n", err);
err = -ENODEV; return -ENODEV;
goto err_reg_init;
} }
} }
err = led_classdev_register(&client->dev, &drvdata->led_dev); err = led_classdev_register(&client->dev, &drvdata->led_dev);
if (err < 0) { if (err < 0) {
dev_err(&client->dev, "Register led class failed: %d\n", err); dev_err(&client->dev, "Register led class failed: %d\n", err);
err = -ENODEV; return -ENODEV;
goto err_class_register;
} }
err = device_create_file(drvdata->led_dev.dev, &dev_attr_mode); err = device_create_file(drvdata->led_dev.dev, &dev_attr_mode);
...@@ -451,9 +449,6 @@ static int __devinit lm3530_probe(struct i2c_client *client, ...@@ -451,9 +449,6 @@ static int __devinit lm3530_probe(struct i2c_client *client,
err_create_file: err_create_file:
led_classdev_unregister(&drvdata->led_dev); led_classdev_unregister(&drvdata->led_dev);
err_class_register:
err_reg_init:
regulator_put(drvdata->regulator);
return err; return err;
} }
...@@ -465,7 +460,6 @@ static int __devexit lm3530_remove(struct i2c_client *client) ...@@ -465,7 +460,6 @@ static int __devexit lm3530_remove(struct i2c_client *client)
if (drvdata->enable) if (drvdata->enable)
regulator_disable(drvdata->regulator); regulator_disable(drvdata->regulator);
regulator_put(drvdata->regulator);
led_classdev_unregister(&drvdata->led_dev); led_classdev_unregister(&drvdata->led_dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment