a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drivers: regulator: remove __dev* attributes.

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 13:26:06 -08:00
parent 6c44512d06
commit 3d68dfe324
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/anatop-regulator.c
View File

@ -188,7 +188,7 @@ static int anatop_regulator_remove(struct platform_device *pdev)
return 0; 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", }, { .compatible = "fsl,anatop-regulator", },
{ /* end */ } { /* end */ }
}; };

8
drivers/regulator/da9055-regulator.c
View File

@ -442,7 +442,7 @@ static struct da9055_regulator_info da9055_regulator_info[] = {
* GPIO can control regulator state and/or select the regulator register * GPIO can control regulator state and/or select the regulator register
* set A/B for voltage ramping. * 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 regulator_config *config,
struct da9055_pdata *pdata, int id) struct da9055_pdata *pdata, int id)
{ {
@ -533,7 +533,7 @@ static inline struct da9055_regulator_info *find_regulator_info(int id)
return NULL; 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 regulator_config config = { };
struct da9055_regulator *regulator; struct da9055_regulator *regulator;
@ -605,7 +605,7 @@ err_regulator:
return ret; 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); 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 = { static struct platform_driver da9055_regulator_driver = {
.probe = da9055_regulator_probe, .probe = da9055_regulator_probe,
.remove = __devexit_p(da9055_regulator_remove), .remove = da9055_regulator_remove,
.driver = { .driver = {
.name = "da9055-regulator", .name = "da9055-regulator",
.owner = THIS_MODULE, .owner = THIS_MODULE,

2
drivers/regulator/fixed.c
View File

@ -246,7 +246,7 @@ static int reg_fixed_voltage_remove(struct platform_device *pdev)
} }
#if defined(CONFIG_OF) #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", }, { .compatible = "regulator-fixed", },
{}, {},
}; };

2
drivers/regulator/gpio-regulator.c
View File

@ -365,7 +365,7 @@ static int gpio_regulator_remove(struct platform_device *pdev)
} }
#if defined(CONFIG_OF) #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", }, { .compatible = "regulator-gpio", },
{}, {},
}; };

8
drivers/regulator/max8973-regulator.c
View File

@ -248,7 +248,7 @@ static struct regulator_ops max8973_dcdc_ops = {
.get_mode = max8973_dcdc_get_mode, .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) struct max8973_regulator_platform_data *pdata)
{ {
int ret; int ret;
@ -359,7 +359,7 @@ static const struct regmap_config max8973_regmap_config = {
.cache_type = REGCACHE_RBTREE, .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) const struct i2c_device_id *id)
{ {
struct max8973_regulator_platform_data *pdata; struct max8973_regulator_platform_data *pdata;
@ -463,7 +463,7 @@ static int __devinit max8973_probe(struct i2c_client *client,
return 0; 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); struct max8973_chip *max = i2c_get_clientdata(client);
@ -484,7 +484,7 @@ static struct i2c_driver max8973_i2c_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = max8973_probe, .probe = max8973_probe,
.remove = __devexit_p(max8973_remove), .remove = max8973_remove,
.id_table = max8973_id, .id_table = max8973_id,
}; };

2
drivers/regulator/palmas-regulator.c
View File

@ -806,7 +806,7 @@ static int palmas_remove(struct platform_device *pdev)
return 0; return 0;
} }
static struct of_device_id __devinitdata of_palmas_match_tbl[] = { static struct of_device_id of_palmas_match_tbl[] = {
{ .compatible = "ti,palmas-pmic", }, { .compatible = "ti,palmas-pmic", },
{ /* end */ } { /* end */ }
}; };

2
drivers/regulator/twl-regulator.c
View File

@ -1064,7 +1064,7 @@ static u8 twl_get_smps_mult(void)
#define TWLFIXED_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLFIXED, label) #define TWLFIXED_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLFIXED, label)
#define TWLSMPS_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLSMPS, label) #define TWLSMPS_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLSMPS, label)
static const struct of_device_id twl_of_match[] __devinitconst = { static const struct of_device_id twl_of_match[] = {
TWL4030_OF_MATCH("ti,twl4030-vaux1", VAUX1), TWL4030_OF_MATCH("ti,twl4030-vaux1", VAUX1),
TWL4030_OF_MATCH("ti,twl4030-vaux2", VAUX2_4030), TWL4030_OF_MATCH("ti,twl4030-vaux2", VAUX2_4030),
TWL4030_OF_MATCH("ti,twl5030-vaux2", VAUX2), TWL4030_OF_MATCH("ti,twl5030-vaux2", VAUX2),