diff options
| author |  Mark Brown <broonie@opensource.wolfsonmicro.com>
| 2012-12-10 12:42:55 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com>
| 2012-12-10 12:42:55 +0900 |
| commit | 1f9cc5f7716d664bfe32289ca61327be01a0a8e3 (patch) | |
| tree | 06b29c20a1d0c195fbf5513fdfb860cb38f09420 /drivers/regulator/virtual.c | |
| parent | Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next (diff) | |
| parent | regulator: remove use of __devexit (diff) | |
| download | linux-1f9cc5f7716d664bfe32289ca61327be01a0a8e3.tar.gz linux-1f9cc5f7716d664bfe32289ca61327be01a0a8e3.tar.bz2 linux-1f9cc5f7716d664bfe32289ca61327be01a0a8e3.zip | |
Merge remote-tracking branch 'regulator/topic/hotplug' into regulator-next
Diffstat (limited to 'drivers/regulator/virtual.c')
| -rw-r--r-- | drivers/regulator/virtual.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/virtual.c b/drivers/regulator/virtual.c index c038e7422538..01c66e9712a4 100644 --- a/drivers/regulator/virtual.c +++ b/drivers/regulator/virtual.c @@ -285,7 +285,7 @@ static const struct attribute_group regulator_virtual_attr_group = { .attrs = regulator_virtual_attributes, }; -static int __devinit regulator_virtual_probe(struct platform_device *pdev) +static int regulator_virtual_probe(struct platform_device *pdev) { char *reg_id = pdev->dev.platform_data; struct virtual_consumer_data *drvdata; @@ -321,7 +321,7 @@ static int __devinit regulator_virtual_probe(struct platform_device *pdev) return 0; } -static int __devexit regulator_virtual_remove(struct platform_device *pdev) +static int regulator_virtual_remove(struct platform_device *pdev) { struct virtual_consumer_data *drvdata = platform_get_drvdata(pdev); @@ -337,7 +337,7 @@ static int __devexit regulator_virtual_remove(struct platform_device *pdev) static struct platform_driver regulator_virtual_consumer_driver = { .probe = regulator_virtual_probe, - .remove = __devexit_p(regulator_virtual_remove), + .remove = regulator_virtual_remove, .driver = { .name = "reg-virt-consumer", .owner = THIS_MODULE, |