aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/da9055-regulator.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-21 16:26:06 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-03 18:57:04 -0500
commit3d68dfe32472fc74cabaa576feb69c3e03f9d4cf (patch)
tree42738e06552b459cf4ab82e2443a9c2bd3ca274c /drivers/regulator/da9055-regulator.c
parent6c44512d06d3f6afcead304f051f4a06ed9be2cd (diff)
Drivers: regulator: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed. This change removes the use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit from these drivers. Based on patches originally written by Bill Pemberton, but redone by me in order to handle some of the coding style issues better, by hand. Cc: Bill Pemberton <wfp5p@virginia.edu> Cc: Liam Girdwood <lrg@ti.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/regulator/da9055-regulator.c')
-rw-r--r--drivers/regulator/da9055-regulator.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/regulator/da9055-regulator.c b/drivers/regulator/da9055-regulator.c
index a4b9cb8c4317..1a05ac66878f 100644
--- a/drivers/regulator/da9055-regulator.c
+++ b/drivers/regulator/da9055-regulator.c
@@ -442,9 +442,9 @@ static struct da9055_regulator_info da9055_regulator_info[] = {
442 * GPIO can control regulator state and/or select the regulator register 442 * GPIO can control regulator state and/or select the regulator register
443 * set A/B for voltage ramping. 443 * set A/B for voltage ramping.
444 */ 444 */
445static __devinit int da9055_gpio_init(struct da9055_regulator *regulator, 445static int da9055_gpio_init(struct da9055_regulator *regulator,
446 struct regulator_config *config, 446 struct regulator_config *config,
447 struct da9055_pdata *pdata, int id) 447 struct da9055_pdata *pdata, int id)
448{ 448{
449 struct da9055_regulator_info *info = regulator->info; 449 struct da9055_regulator_info *info = regulator->info;
450 int ret = 0; 450 int ret = 0;
@@ -533,7 +533,7 @@ static inline struct da9055_regulator_info *find_regulator_info(int id)
533 return NULL; 533 return NULL;
534} 534}
535 535
536static int __devinit da9055_regulator_probe(struct platform_device *pdev) 536static int da9055_regulator_probe(struct platform_device *pdev)
537{ 537{
538 struct regulator_config config = { }; 538 struct regulator_config config = { };
539 struct da9055_regulator *regulator; 539 struct da9055_regulator *regulator;
@@ -605,7 +605,7 @@ err_regulator:
605 return ret; 605 return ret;
606} 606}
607 607
608static int __devexit da9055_regulator_remove(struct platform_device *pdev) 608static int da9055_regulator_remove(struct platform_device *pdev)
609{ 609{
610 struct da9055_regulator *regulator = platform_get_drvdata(pdev); 610 struct da9055_regulator *regulator = platform_get_drvdata(pdev);
611 611
@@ -616,7 +616,7 @@ static int __devexit da9055_regulator_remove(struct platform_device *pdev)
616 616
617static struct platform_driver da9055_regulator_driver = { 617static struct platform_driver da9055_regulator_driver = {
618 .probe = da9055_regulator_probe, 618 .probe = da9055_regulator_probe,
619 .remove = __devexit_p(da9055_regulator_remove), 619 .remove = da9055_regulator_remove,
620 .driver = { 620 .driver = {
621 .name = "da9055-regulator", 621 .name = "da9055-regulator",
622 .owner = THIS_MODULE, 622 .owner = THIS_MODULE,