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/da9052-regulator.c | |
| parent | 207f30894a8469849d9f5663149d966ff4d411e8 (diff) | |
| parent | 8dc995f56ef7aedb41873fdeaa1971f3aa166ebd (diff) | |
Merge remote-tracking branch 'regulator/topic/hotplug' into regulator-next
Diffstat (limited to 'drivers/regulator/da9052-regulator.c')
| -rw-r--r-- | drivers/regulator/da9052-regulator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c index 0a2586a39e6..d0963090442 100644 --- a/drivers/regulator/da9052-regulator.c +++ b/drivers/regulator/da9052-regulator.c @@ -365,7 +365,7 @@ static inline struct da9052_regulator_info *find_regulator_info(u8 chip_id, return NULL; } -static int __devinit da9052_regulator_probe(struct platform_device *pdev) +static int da9052_regulator_probe(struct platform_device *pdev) { struct regulator_config config = { }; struct da9052_regulator *regulator; @@ -430,7 +430,7 @@ static int __devinit da9052_regulator_probe(struct platform_device *pdev) return 0; } -static int __devexit da9052_regulator_remove(struct platform_device *pdev) +static int da9052_regulator_remove(struct platform_device *pdev) { struct da9052_regulator *regulator = platform_get_drvdata(pdev); @@ -440,7 +440,7 @@ static int __devexit da9052_regulator_remove(struct platform_device *pdev) static struct platform_driver da9052_regulator_driver = { .probe = da9052_regulator_probe, - .remove = __devexit_p(da9052_regulator_remove), + .remove = da9052_regulator_remove, .driver = { .name = "da9052-regulator", .owner = THIS_MODULE, |