Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+17 -17
+1 -1
drivers/regulator/anatop-regulator.c
··· 188 188 return 0; 189 189 } 190 190 191 - static struct of_device_id __devinitdata of_anatop_regulator_match_tbl[] = { 191 + static struct of_device_id of_anatop_regulator_match_tbl[] = { 192 192 { .compatible = "fsl,anatop-regulator", }, 193 193 { /* end */ } 194 194 };
+6 -6
drivers/regulator/da9055-regulator.c
··· 442 442 * GPIO can control regulator state and/or select the regulator register 443 443 * set A/B for voltage ramping. 444 444 */ 445 - static __devinit int da9055_gpio_init(struct da9055_regulator *regulator, 446 - struct regulator_config *config, 447 - struct da9055_pdata *pdata, int id) 445 + static int da9055_gpio_init(struct da9055_regulator *regulator, 446 + struct regulator_config *config, 447 + struct da9055_pdata *pdata, int id) 448 448 { 449 449 struct da9055_regulator_info *info = regulator->info; 450 450 int ret = 0; ··· 533 533 return NULL; 534 534 } 535 535 536 - static int __devinit da9055_regulator_probe(struct platform_device *pdev) 536 + static int da9055_regulator_probe(struct platform_device *pdev) 537 537 { 538 538 struct regulator_config config = { }; 539 539 struct da9055_regulator *regulator; ··· 605 605 return ret; 606 606 } 607 607 608 - static int __devexit da9055_regulator_remove(struct platform_device *pdev) 608 + static int da9055_regulator_remove(struct platform_device *pdev) 609 609 { 610 610 struct da9055_regulator *regulator = platform_get_drvdata(pdev); 611 611 ··· 616 616 617 617 static struct platform_driver da9055_regulator_driver = { 618 618 .probe = da9055_regulator_probe, 619 - .remove = __devexit_p(da9055_regulator_remove), 619 + .remove = da9055_regulator_remove, 620 620 .driver = { 621 621 .name = "da9055-regulator", 622 622 .owner = THIS_MODULE,
+1 -1
drivers/regulator/fixed.c
··· 246 246 } 247 247 248 248 #if defined(CONFIG_OF) 249 - static const struct of_device_id fixed_of_match[] __devinitconst = { 249 + static const struct of_device_id fixed_of_match[] = { 250 250 { .compatible = "regulator-fixed", }, 251 251 {}, 252 252 };
+1 -1
drivers/regulator/gpio-regulator.c
··· 365 365 } 366 366 367 367 #if defined(CONFIG_OF) 368 - static const struct of_device_id regulator_gpio_of_match[] __devinitconst = { 368 + static const struct of_device_id regulator_gpio_of_match[] = { 369 369 { .compatible = "regulator-gpio", }, 370 370 {}, 371 371 };
+6 -6
drivers/regulator/max8973-regulator.c
··· 248 248 .get_mode = max8973_dcdc_get_mode, 249 249 }; 250 250 251 - static int __devinit max8973_init_dcdc(struct max8973_chip *max, 252 - struct max8973_regulator_platform_data *pdata) 251 + static int max8973_init_dcdc(struct max8973_chip *max, 252 + struct max8973_regulator_platform_data *pdata) 253 253 { 254 254 int ret; 255 255 uint8_t control1 = 0; ··· 359 359 .cache_type = REGCACHE_RBTREE, 360 360 }; 361 361 362 - static int __devinit max8973_probe(struct i2c_client *client, 363 - const struct i2c_device_id *id) 362 + static int max8973_probe(struct i2c_client *client, 363 + const struct i2c_device_id *id) 364 364 { 365 365 struct max8973_regulator_platform_data *pdata; 366 366 struct regulator_config config = { }; ··· 463 463 return 0; 464 464 } 465 465 466 - static int __devexit max8973_remove(struct i2c_client *client) 466 + static int max8973_remove(struct i2c_client *client) 467 467 { 468 468 struct max8973_chip *max = i2c_get_clientdata(client); 469 469 ··· 484 484 .owner = THIS_MODULE, 485 485 }, 486 486 .probe = max8973_probe, 487 - .remove = __devexit_p(max8973_remove), 487 + .remove = max8973_remove, 488 488 .id_table = max8973_id, 489 489 }; 490 490
+1 -1
drivers/regulator/palmas-regulator.c
··· 806 806 return 0; 807 807 } 808 808 809 - static struct of_device_id __devinitdata of_palmas_match_tbl[] = { 809 + static struct of_device_id of_palmas_match_tbl[] = { 810 810 { .compatible = "ti,palmas-pmic", }, 811 811 { /* end */ } 812 812 };
+1 -1
drivers/regulator/twl-regulator.c
··· 1064 1064 #define TWLFIXED_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLFIXED, label) 1065 1065 #define TWLSMPS_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLSMPS, label) 1066 1066 1067 - static const struct of_device_id twl_of_match[] __devinitconst = { 1067 + static const struct of_device_id twl_of_match[] = { 1068 1068 TWL4030_OF_MATCH("ti,twl4030-vaux1", VAUX1), 1069 1069 TWL4030_OF_MATCH("ti,twl4030-vaux2", VAUX2_4030), 1070 1070 TWL4030_OF_MATCH("ti,twl5030-vaux2", VAUX2),