|
@@ -146,8 +146,9 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
|
|
|
config.driver_data = tps6105x;
|
|
|
|
|
|
/* Register regulator with framework */
|
|
|
- tps6105x->regulator = regulator_register(&tps6105x_regulator_desc,
|
|
|
- &config);
|
|
|
+ tps6105x->regulator = devm_regulator_register(&pdev->dev,
|
|
|
+ &tps6105x_regulator_desc,
|
|
|
+ &config);
|
|
|
if (IS_ERR(tps6105x->regulator)) {
|
|
|
ret = PTR_ERR(tps6105x->regulator);
|
|
|
dev_err(&tps6105x->client->dev,
|
|
@@ -159,20 +160,12 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int tps6105x_regulator_remove(struct platform_device *pdev)
|
|
|
-{
|
|
|
- struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev);
|
|
|
- regulator_unregister(tps6105x->regulator);
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
static struct platform_driver tps6105x_regulator_driver = {
|
|
|
.driver = {
|
|
|
.name = "tps6105x-regulator",
|
|
|
.owner = THIS_MODULE,
|
|
|
},
|
|
|
.probe = tps6105x_regulator_probe,
|
|
|
- .remove = tps6105x_regulator_remove,
|
|
|
};
|
|
|
|
|
|
static __init int tps6105x_regulator_init(void)
|