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/gpio-regulator.c | |
| parent | 207f30894a8469849d9f5663149d966ff4d411e8 (diff) | |
| parent | 8dc995f56ef7aedb41873fdeaa1971f3aa166ebd (diff) | |
| download | blackbird-op-linux-1f9cc5f7716d664bfe32289ca61327be01a0a8e3.tar.gz blackbird-op-linux-1f9cc5f7716d664bfe32289ca61327be01a0a8e3.zip | |
Merge remote-tracking branch 'regulator/topic/hotplug' into regulator-next
Diffstat (limited to 'drivers/regulator/gpio-regulator.c')
| -rw-r--r-- | drivers/regulator/gpio-regulator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index 8c4e23739494..2cfd9d3079e8 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c @@ -220,7 +220,7 @@ static struct regulator_ops gpio_regulator_current_ops = { .set_current_limit = gpio_regulator_set_current_limit, }; -static int __devinit gpio_regulator_probe(struct platform_device *pdev) +static int gpio_regulator_probe(struct platform_device *pdev) { struct gpio_regulator_config *config = pdev->dev.platform_data; struct device_node *np = pdev->dev.of_node; @@ -348,7 +348,7 @@ err: return ret; } -static int __devexit gpio_regulator_remove(struct platform_device *pdev) +static int gpio_regulator_remove(struct platform_device *pdev) { struct gpio_regulator_data *drvdata = platform_get_drvdata(pdev); @@ -373,7 +373,7 @@ static const struct of_device_id regulator_gpio_of_match[] __devinitconst = { static struct platform_driver gpio_regulator_driver = { .probe = gpio_regulator_probe, - .remove = __devexit_p(gpio_regulator_remove), + .remove = gpio_regulator_remove, .driver = { .name = "gpio-regulator", .owner = THIS_MODULE, |
