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

Commit 3d68dfe3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

drivers/regulator/anatop-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static int anatop_regulator_remove(struct platform_device *pdev) 
	return 0;

}



static struct of_device_id __devinitdata of_anatop_regulator_match_tbl[] = {

static struct of_device_id of_anatop_regulator_match_tbl[] = {

	{ .compatible = "fsl,anatop-regulator", },

	{ /* end */ }

};

drivers/regulator/da9055-regulator.c

+6 −6
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static struct da9055_regulator_info da9055_regulator_info[] = { 
 * GPIO can control regulator state and/or select the regulator register

 * set A/B for voltage ramping.

 */

static __devinit int da9055_gpio_init(struct da9055_regulator *regulator,

static int da9055_gpio_init(struct da9055_regulator *regulator,

			    struct regulator_config *config,

			    struct da9055_pdata *pdata, int id)

{
@@ -533,7 +533,7 @@ static inline struct da9055_regulator_info *find_regulator_info(int id) 
	return NULL;

}



static int __devinit da9055_regulator_probe(struct platform_device *pdev)

static int da9055_regulator_probe(struct platform_device *pdev)

{

	struct regulator_config config = { };

	struct da9055_regulator *regulator;
@@ -605,7 +605,7 @@ static int __devinit da9055_regulator_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit da9055_regulator_remove(struct platform_device *pdev)

static int da9055_regulator_remove(struct platform_device *pdev)

{

	struct da9055_regulator *regulator = platform_get_drvdata(pdev);
@@ -616,7 +616,7 @@ static int __devexit da9055_regulator_remove(struct platform_device *pdev) 


static struct platform_driver da9055_regulator_driver = {

	.probe = da9055_regulator_probe,

	.remove = __devexit_p(da9055_regulator_remove),

	.remove = da9055_regulator_remove,

	.driver = {

		.name = "da9055-regulator",

		.owner = THIS_MODULE,

drivers/regulator/fixed.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int reg_fixed_voltage_remove(struct platform_device *pdev) 
}



#if defined(CONFIG_OF)

static const struct of_device_id fixed_of_match[] __devinitconst = {

static const struct of_device_id fixed_of_match[] = {

	{ .compatible = "regulator-fixed", },

	{},

};

drivers/regulator/gpio-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static int gpio_regulator_remove(struct platform_device *pdev) 
}



#if defined(CONFIG_OF)

static const struct of_device_id regulator_gpio_of_match[] __devinitconst = {

static const struct of_device_id regulator_gpio_of_match[] = {

	{ .compatible = "regulator-gpio", },

	{},

};

drivers/regulator/max8973-regulator.c

+6 −6
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static struct regulator_ops max8973_dcdc_ops = { 
	.get_mode		= max8973_dcdc_get_mode,

};



static int __devinit max8973_init_dcdc(struct max8973_chip *max,

static int max8973_init_dcdc(struct max8973_chip *max,

			     struct max8973_regulator_platform_data *pdata)

{

	int ret;
@@ -359,7 +359,7 @@ static const struct regmap_config max8973_regmap_config = { 
	.cache_type		= REGCACHE_RBTREE,

};



static int __devinit max8973_probe(struct i2c_client *client,

static int max8973_probe(struct i2c_client *client,

			 const struct i2c_device_id *id)

{

	struct max8973_regulator_platform_data *pdata;
@@ -463,7 +463,7 @@ static int __devinit max8973_probe(struct i2c_client *client, 
	return 0;

}



static int __devexit max8973_remove(struct i2c_client *client)

static int max8973_remove(struct i2c_client *client)

{

	struct max8973_chip *max = i2c_get_clientdata(client);
@@ -484,7 +484,7 @@ static struct i2c_driver max8973_i2c_driver = { 
		.owner = THIS_MODULE,

	},

	.probe = max8973_probe,

	.remove = __devexit_p(max8973_remove),

	.remove = max8973_remove,

	.id_table = max8973_id,

};