openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 15:04:54 -08:00
parent 47b1ea75fe
commit 6d2cea4fca
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/power/ab8500_bmdata.c
View File

@ -452,10 +452,8 @@ struct abx500_bm_data ab8500_bm_data = {
.fg_params = &fg, .fg_params = &fg,
}; };
int __devinit int bmdevs_of_probe(struct device *dev, struct device_node *np,
bmdevs_of_probe(struct device *dev, struct abx500_bm_data **battery)
struct device_node *np,
struct abx500_bm_data **battery)
{ {
struct abx500_battery_type *btype; struct abx500_battery_type *btype;
struct device_node *np_bat_supply; struct device_node *np_bat_supply;

2
drivers/power/olpc_battery.c
View File

@ -668,7 +668,7 @@ static int olpc_battery_remove(struct platform_device *pdev)
return 0; return 0;
} }
static const struct of_device_id olpc_battery_ids[] __devinitconst = { static const struct of_device_id olpc_battery_ids[] = {
{ .compatible = "olpc,xo1-battery" }, { .compatible = "olpc,xo1-battery" },
{} {}
}; };

6
drivers/power/reset/gpio-poweroff.c
View File

@ -46,7 +46,7 @@ static void gpio_poweroff_do_poweroff(void)
WARN_ON(1); WARN_ON(1);
} }
static int __devinit gpio_poweroff_probe(struct platform_device *pdev) static int gpio_poweroff_probe(struct platform_device *pdev)
{ {
enum of_gpio_flags flags; enum of_gpio_flags flags;
bool input = false; bool input = false;
@ -96,7 +96,7 @@ static int __devinit gpio_poweroff_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
static int __devexit gpio_poweroff_remove(struct platform_device *pdev) static int gpio_poweroff_remove(struct platform_device *pdev)
{ {
if (gpio_num != -1) if (gpio_num != -1)
gpio_free(gpio_num); gpio_free(gpio_num);
@ -113,7 +113,7 @@ static const struct of_device_id of_gpio_poweroff_match[] = {
static struct platform_driver gpio_poweroff_driver = { static struct platform_driver gpio_poweroff_driver = {
.probe = gpio_poweroff_probe, .probe = gpio_poweroff_probe,
.remove = __devexit_p(gpio_poweroff_remove), .remove = gpio_poweroff_remove,
.driver = { .driver = {
.name = "poweroff-gpio", .name = "poweroff-gpio",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/power/rx51_battery.c
View File

@ -197,7 +197,7 @@ static enum power_supply_property rx51_battery_props[] = {
POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
}; };
static int __devinit rx51_battery_probe(struct platform_device *pdev) static int rx51_battery_probe(struct platform_device *pdev)
{ {
struct rx51_device_info *di; struct rx51_device_info *di;
int ret; int ret;
@ -224,7 +224,7 @@ static int __devinit rx51_battery_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit rx51_battery_remove(struct platform_device *pdev) static int rx51_battery_remove(struct platform_device *pdev)
{ {
struct rx51_device_info *di = platform_get_drvdata(pdev); struct rx51_device_info *di = platform_get_drvdata(pdev);
@ -237,7 +237,7 @@ static int __devexit rx51_battery_remove(struct platform_device *pdev)
static struct platform_driver rx51_battery_driver = { static struct platform_driver rx51_battery_driver = {
.probe = rx51_battery_probe, .probe = rx51_battery_probe,
.remove = __devexit_p(rx51_battery_remove), .remove = rx51_battery_remove,
.driver = { .driver = {
.name = "rx51-battery", .name = "rx51-battery",
.owner = THIS_MODULE, .owner = THIS_MODULE,