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

Drivers: power: 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, __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: Anton Vorontsov <cbou@mail.ru>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Jamie Lentin <jm@lentin.co.uk>
Cc: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+9 -11
+2 -4
drivers/power/ab8500_bmdata.c
··· 452 452 .fg_params = &fg, 453 453 }; 454 454 455 - int __devinit 456 - bmdevs_of_probe(struct device *dev, 457 - struct device_node *np, 458 - struct abx500_bm_data **battery) 455 + int bmdevs_of_probe(struct device *dev, struct device_node *np, 456 + struct abx500_bm_data **battery) 459 457 { 460 458 struct abx500_battery_type *btype; 461 459 struct device_node *np_bat_supply;
+1 -1
drivers/power/olpc_battery.c
··· 668 668 return 0; 669 669 } 670 670 671 - static const struct of_device_id olpc_battery_ids[] __devinitconst = { 671 + static const struct of_device_id olpc_battery_ids[] = { 672 672 { .compatible = "olpc,xo1-battery" }, 673 673 {} 674 674 };
+3 -3
drivers/power/reset/gpio-poweroff.c
··· 46 46 WARN_ON(1); 47 47 } 48 48 49 - static int __devinit gpio_poweroff_probe(struct platform_device *pdev) 49 + static int gpio_poweroff_probe(struct platform_device *pdev) 50 50 { 51 51 enum of_gpio_flags flags; 52 52 bool input = false; ··· 96 96 return -ENODEV; 97 97 } 98 98 99 - static int __devexit gpio_poweroff_remove(struct platform_device *pdev) 99 + static int gpio_poweroff_remove(struct platform_device *pdev) 100 100 { 101 101 if (gpio_num != -1) 102 102 gpio_free(gpio_num); ··· 113 113 114 114 static struct platform_driver gpio_poweroff_driver = { 115 115 .probe = gpio_poweroff_probe, 116 - .remove = __devexit_p(gpio_poweroff_remove), 116 + .remove = gpio_poweroff_remove, 117 117 .driver = { 118 118 .name = "poweroff-gpio", 119 119 .owner = THIS_MODULE,
+3 -3
drivers/power/rx51_battery.c
··· 197 197 POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, 198 198 }; 199 199 200 - static int __devinit rx51_battery_probe(struct platform_device *pdev) 200 + static int rx51_battery_probe(struct platform_device *pdev) 201 201 { 202 202 struct rx51_device_info *di; 203 203 int ret; ··· 224 224 return 0; 225 225 } 226 226 227 - static int __devexit rx51_battery_remove(struct platform_device *pdev) 227 + static int rx51_battery_remove(struct platform_device *pdev) 228 228 { 229 229 struct rx51_device_info *di = platform_get_drvdata(pdev); 230 230 ··· 237 237 238 238 static struct platform_driver rx51_battery_driver = { 239 239 .probe = rx51_battery_probe, 240 - .remove = __devexit_p(rx51_battery_remove), 240 + .remove = rx51_battery_remove, 241 241 .driver = { 242 242 .name = "rx51-battery", 243 243 .owner = THIS_MODULE,