diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 13:19:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 13:19:10 -0800 |
| commit | 15333539a9b3022656f815f643a77f6b054b335f (patch) | |
| tree | 2c5eabbd1ba12a0bd33e8f10c32847f88567d681 /drivers/regulator/stw481x-vmmc.c | |
| parent | bb1b64908f5a346b0654f02999e1a022a7e0c07d (diff) | |
| parent | 07b19808486054f356dbf3495a277f51af062b35 (diff) | |
Merge tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown:
"A respin of the merges in the previous pull request with one extra
fix.
A quiet release for the regulator API, quite a large number of small
improvements all over but other than the addition of new drivers for
the AS3722 and MAX14577 there is nothing of substantial non-local
impact"
* tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (47 commits)
regulator: pfuze100-regulator: Improve dev_info() message
regulator: pfuze100-regulator: Fix some checkpatch complaints
regulator: twl: Fix checkpatch issue
regulator: core: Fix checkpatch issue
regulator: anatop-regulator: Remove unneeded memset()
regulator: s5m8767: Update LDO index in s5m8767-regulator.txt
regulator: as3722: set enable time for SD0/1/6
regulator: as3722: detect SD0 low-voltage mode
regulator: tps62360: Fix up a pointer-integer size mismatch warning
regulator: anatop-regulator: Remove unneeded kstrdup()
regulator: act8865: Fix build error when !OF
regulator: act8865: register all regulators regardless of how many are used
regulator: wm831x-dcdc: Remove unneeded 'err' label
regulator: anatop-regulator: Add MODULE_ALIAS()
regulator: act8865: fix incorrect devm_kzalloc for act8865
regulator: act8865: Remove set_suspend_[en|dis]able implementation
regulator: act8865: Remove unneeded regulator_unregister() calls
regulator: s2mps11: Clean up redundant code
regulator: tps65910: Simplify setting enable_mask for regulators
regulator: act8865: add device tree binding doc
...
Diffstat (limited to 'drivers/regulator/stw481x-vmmc.c')
| -rw-r--r-- | drivers/regulator/stw481x-vmmc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/regulator/stw481x-vmmc.c b/drivers/regulator/stw481x-vmmc.c index f78857bd6a15..a7e152696a02 100644 --- a/drivers/regulator/stw481x-vmmc.c +++ b/drivers/regulator/stw481x-vmmc.c @@ -74,7 +74,8 @@ static int stw481x_vmmc_regulator_probe(struct platform_device *pdev) config.init_data = of_get_regulator_init_data(&pdev->dev, pdev->dev.of_node); - stw481x->vmmc_regulator = regulator_register(&vmmc_regulator, &config); + stw481x->vmmc_regulator = devm_regulator_register(&pdev->dev, + &vmmc_regulator, &config); if (IS_ERR(stw481x->vmmc_regulator)) { dev_err(&pdev->dev, "error initializing STw481x VMMC regulator\n"); @@ -85,14 +86,6 @@ static int stw481x_vmmc_regulator_probe(struct platform_device *pdev) return 0; } -static int stw481x_vmmc_regulator_remove(struct platform_device *pdev) -{ - struct stw481x *stw481x = dev_get_platdata(&pdev->dev); - - regulator_unregister(stw481x->vmmc_regulator); - return 0; -} - static const struct of_device_id stw481x_vmmc_match[] = { { .compatible = "st,stw481x-vmmc", }, {}, @@ -105,7 +98,6 @@ static struct platform_driver stw481x_vmmc_regulator_driver = { .of_match_table = stw481x_vmmc_match, }, .probe = stw481x_vmmc_regulator_probe, - .remove = stw481x_vmmc_regulator_remove, }; module_platform_driver(stw481x_vmmc_regulator_driver); |