diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:32 +0100 |
| commit | 420118d48311e0c4ef4aace5aede35079ecc2412 (patch) | |
| tree | a4affbc11b9271d786b9c9e5711b1e7dc873d3e8 /drivers/regulator/da9055-regulator.c | |
| parent | 2a2bec6554e9e9d0ae351575ca1f72df1fa0f15f (diff) | |
| parent | 32dadef2190efd2e06331825b11881daf100d6d9 (diff) | |
Merge remote-tracking branch 'regulator/topic/alias' into regulator-next
Diffstat (limited to 'drivers/regulator/da9055-regulator.c')
| -rw-r--r-- | drivers/regulator/da9055-regulator.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/drivers/regulator/da9055-regulator.c b/drivers/regulator/da9055-regulator.c index 77b53e5a231..7f340206d32 100644 --- a/drivers/regulator/da9055-regulator.c +++ b/drivers/regulator/da9055-regulator.c @@ -564,13 +564,13 @@ static int da9055_regulator_probe(struct platform_device *pdev) if (ret < 0) return ret; - regulator->rdev = regulator_register(®ulator->info->reg_desc, - &config); + regulator->rdev = devm_regulator_register(&pdev->dev, + ®ulator->info->reg_desc, + &config); if (IS_ERR(regulator->rdev)) { dev_err(&pdev->dev, "Failed to register regulator %s\n", regulator->info->reg_desc.name); - ret = PTR_ERR(regulator->rdev); - return ret; + return PTR_ERR(regulator->rdev); } /* Only LDO 5 and 6 has got the over current interrupt */ @@ -588,7 +588,7 @@ static int da9055_regulator_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Failed to request Regulator IRQ %d: %d\n", irq, ret); - goto err_regulator; + return ret; } } } @@ -596,24 +596,10 @@ static int da9055_regulator_probe(struct platform_device *pdev) platform_set_drvdata(pdev, regulator); return 0; - -err_regulator: - regulator_unregister(regulator->rdev); - return ret; -} - -static int da9055_regulator_remove(struct platform_device *pdev) -{ - struct da9055_regulator *regulator = platform_get_drvdata(pdev); - - regulator_unregister(regulator->rdev); - - return 0; } static struct platform_driver da9055_regulator_driver = { .probe = da9055_regulator_probe, - .remove = da9055_regulator_remove, .driver = { .name = "da9055-regulator", .owner = THIS_MODULE, |