Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d2cea4f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 47b1ea75

drivers/power/ab8500_bmdata.c

+2 −4
Original line number Diff line number Diff line
@@ -452,9 +452,7 @@ struct abx500_bm_data ab8500_bm_data = { 
	.fg_params		= &fg,

};



int __devinit

bmdevs_of_probe(struct device *dev,

		struct device_node *np,

int bmdevs_of_probe(struct device *dev, struct device_node *np,

		    struct abx500_bm_data **battery)

{

	struct	abx500_battery_type *btype;

drivers/power/olpc_battery.c

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static int olpc_battery_remove(struct platform_device *pdev) 
	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" },

	{}

};

drivers/power/reset/gpio-poweroff.c

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static void gpio_poweroff_do_poweroff(void) 
	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;

	bool input = false;
@@ -96,7 +96,7 @@ static int __devinit gpio_poweroff_probe(struct platform_device *pdev) 
	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)

		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 = {

	.probe = gpio_poweroff_probe,

	.remove = __devexit_p(gpio_poweroff_remove),

	.remove = gpio_poweroff_remove,

	.driver = {

		   .name = "poweroff-gpio",

		   .owner = THIS_MODULE,

drivers/power/rx51_battery.c

+3 −3
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static enum power_supply_property rx51_battery_props[] = { 
	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;

	int ret;
@@ -224,7 +224,7 @@ static int __devinit rx51_battery_probe(struct platform_device *pdev) 
	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);
@@ -237,7 +237,7 @@ static int __devexit rx51_battery_remove(struct platform_device *pdev) 


static struct platform_driver rx51_battery_driver = {

	.probe = rx51_battery_probe,

	.remove = __devexit_p(rx51_battery_remove),

	.remove = rx51_battery_remove,

	.driver = {

		.name = "rx51-battery",

		.owner = THIS_MODULE,