Skip to content

Commit

Permalink
regulator: remove use of __devinit
Browse files Browse the repository at this point in the history 
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Bill Pemberton authored and Mark Brown committed Nov 20, 2012
1 parent 5eb9f2b commit a502357
Show file tree
Hide file tree
Showing 57 changed files with 78 additions and 78 deletions.
2 changes: 1 addition & 1 deletion drivers/regulator/88pm8607.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ static int pm8607_regulator_dt_init(struct platform_device *pdev,
#define pm8607_regulator_dt_init(x, y, z) (-1)
#endif

static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
static int pm8607_regulator_probe(struct platform_device *pdev)
{
struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct pm8607_regulator_info *info = NULL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/ab3100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = {
* for all the different regulators.
*/

static int __devinit ab3100_regulators_probe(struct platform_device *pdev)
static int ab3100_regulators_probe(struct platform_device *pdev)
{
struct ab3100_platform_data *plfdata = pdev->dev.platform_data;
struct regulator_config config = { };
Expand Down
8 changes: 4 additions & 4 deletions drivers/regulator/ab8500.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ static struct ab8500_reg_init ab8500_reg_init[] = {
REG_INIT(AB8500_REGUCTRLDISCH2, 0x04, 0x44, 0x16),
};

static __devinit int
static int
ab8500_regulator_init_registers(struct platform_device *pdev, int id, int value)
{
int err;
Expand Down Expand Up @@ -676,7 +676,7 @@ ab8500_regulator_init_registers(struct platform_device *pdev, int id, int value)
return 0;
}

static __devinit int ab8500_regulator_register(struct platform_device *pdev,
static int ab8500_regulator_register(struct platform_device *pdev,
struct regulator_init_data *init_data,
int id,
struct device_node *np)
Expand Down Expand Up @@ -735,7 +735,7 @@ static struct of_regulator_match ab8500_regulator_matches[] = {
{ .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, },
};

static __devinit int
static int
ab8500_regulator_of_probe(struct platform_device *pdev, struct device_node *np)
{
int err, i;
Expand All @@ -751,7 +751,7 @@ ab8500_regulator_of_probe(struct platform_device *pdev, struct device_node *np)
return 0;
}

static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
static int ab8500_regulator_probe(struct platform_device *pdev)
{
struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
struct ab8500_platform_data *pdata;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/ad5398.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ static const struct i2c_device_id ad5398_id[] = {
};
MODULE_DEVICE_TABLE(i2c, ad5398_id);

static int __devinit ad5398_probe(struct i2c_client *client,
static int ad5398_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct regulator_init_data *init_data = client->dev.platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/anatop-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static struct regulator_ops anatop_rops = {
.map_voltage = regulator_map_voltage_linear,
};

static int __devinit anatop_regulator_probe(struct platform_device *pdev)
static int anatop_regulator_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/arizona-ldo1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static const struct regulator_init_data arizona_ldo1_default = {
.num_consumer_supplies = 1,
};

static __devinit int arizona_ldo1_probe(struct platform_device *pdev)
static int arizona_ldo1_probe(struct platform_device *pdev)
{
struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
struct regulator_config config = { };
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/arizona-micsupp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static const struct regulator_init_data arizona_micsupp_default = {
.num_consumer_supplies = 1,
};

static __devinit int arizona_micsupp_probe(struct platform_device *pdev)
static int arizona_micsupp_probe(struct platform_device *pdev)
{
struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
struct regulator_config config = { };
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/da903x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ static inline struct da903x_regulator_info *find_regulator_info(int id)
return NULL;
}

static int __devinit da903x_regulator_probe(struct platform_device *pdev)
static int da903x_regulator_probe(struct platform_device *pdev)
{
struct da903x_regulator_info *ri = NULL;
struct regulator_dev *rdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/da9052-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ static inline struct da9052_regulator_info *find_regulator_info(u8 chip_id,
return NULL;
}

static int __devinit da9052_regulator_probe(struct platform_device *pdev)
static int da9052_regulator_probe(struct platform_device *pdev)
{
struct regulator_config config = { };
struct da9052_regulator *regulator;
Expand Down
6 changes: 3 additions & 3 deletions drivers/regulator/db8500-prcmu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {
},
};

static __devinit int db8500_regulator_register(struct platform_device *pdev,
static int db8500_regulator_register(struct platform_device *pdev,
struct regulator_init_data *init_data,
int id,
struct device_node *np)
Expand Down Expand Up @@ -474,7 +474,7 @@ static struct of_regulator_match db8500_regulator_matches[] = {
{ .name = "db8500_esram34_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },
};

static __devinit int
static int
db8500_regulator_of_probe(struct platform_device *pdev,
struct device_node *np)
{
Expand All @@ -491,7 +491,7 @@ db8500_regulator_of_probe(struct platform_device *pdev,
return 0;
}

static int __devinit db8500_regulator_probe(struct platform_device *pdev)
static int db8500_regulator_probe(struct platform_device *pdev)
{
struct regulator_init_data *db8500_init_data =
dev_get_platdata(&pdev->dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/dbx500-prcmu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ int __attribute__((weak)) dbx500_regulator_testcase(
return 0;
}

int __devinit
int
ux500_regulator_debug_init(struct platform_device *pdev,
struct dbx500_regulator_info *regulator_info,
int num_regulators)
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/dummy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static struct regulator_desc dummy_desc = {
.ops = &dummy_ops,
};

static int __devinit dummy_regulator_probe(struct platform_device *pdev)
static int dummy_regulator_probe(struct platform_device *pdev)
{
struct regulator_config config = { };
int ret;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/fan53555.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ static struct regmap_config fan53555_regmap_config = {
.val_bits = 8,
};

static int __devinit fan53555_regulator_probe(struct i2c_client *client,
static int fan53555_regulator_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct fan53555_device_info *di;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/fixed.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static struct regulator_ops fixed_voltage_ops = {
.list_voltage = fixed_voltage_list_voltage,
};

static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
static int reg_fixed_voltage_probe(struct platform_device *pdev)
{
struct fixed_voltage_config *config;
struct fixed_voltage_data *drvdata;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/gpio-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ static struct regulator_ops gpio_regulator_current_ops = {
.set_current_limit = gpio_regulator_set_current_limit,
};

static int __devinit gpio_regulator_probe(struct platform_device *pdev)
static int gpio_regulator_probe(struct platform_device *pdev)
{
struct gpio_regulator_config *config = pdev->dev.platform_data;
struct device_node *np = pdev->dev.of_node;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/isl6271a-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static const struct regulator_desc isl_rd[] = {
},
};

static int __devinit isl6271a_probe(struct i2c_client *i2c,
static int isl6271a_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct regulator_config config = { };
Expand Down
4 changes: 2 additions & 2 deletions drivers/regulator/lp3971.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ static int lp3971_set_bits(struct lp3971 *lp3971, u8 reg, u16 mask, u16 val)
return ret;
}

static int __devinit setup_regulators(struct lp3971 *lp3971,
static int setup_regulators(struct lp3971 *lp3971,
struct lp3971_platform_data *pdata)
{
int i, err;
Expand Down Expand Up @@ -429,7 +429,7 @@ static int __devinit setup_regulators(struct lp3971 *lp3971,
return err;
}

static int __devinit lp3971_i2c_probe(struct i2c_client *i2c,
static int lp3971_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct lp3971 *lp3971;
Expand Down
4 changes: 2 additions & 2 deletions drivers/regulator/lp3972.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ static const struct regulator_desc regulators[] = {
},
};

static int __devinit setup_regulators(struct lp3972 *lp3972,
static int setup_regulators(struct lp3972 *lp3972,
struct lp3972_platform_data *pdata)
{
int i, err;
Expand Down Expand Up @@ -523,7 +523,7 @@ static int __devinit setup_regulators(struct lp3972 *lp3972,
return err;
}

static int __devinit lp3972_i2c_probe(struct i2c_client *i2c,
static int lp3972_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct lp3972 *lp3972;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/lp8788-buck.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ static int lp8788_init_dvs(struct lp8788_buck *buck, enum lp8788_buck_id id)
default_dvs_mode[id]);
}

static __devinit int lp8788_buck_probe(struct platform_device *pdev)
static int lp8788_buck_probe(struct platform_device *pdev)
{
struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
int id = pdev->id;
Expand Down
4 changes: 2 additions & 2 deletions drivers/regulator/lp8788-ldo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ static int lp8788_config_ldo_enable_mode(struct lp8788_ldo *ldo,
val[enable_id]);
}

static __devinit int lp8788_dldo_probe(struct platform_device *pdev)
static int lp8788_dldo_probe(struct platform_device *pdev)
{
struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
int id = pdev->id;
Expand Down Expand Up @@ -768,7 +768,7 @@ static struct platform_driver lp8788_dldo_driver = {
},
};

static __devinit int lp8788_aldo_probe(struct platform_device *pdev)
static int lp8788_aldo_probe(struct platform_device *pdev)
{
struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
int id = pdev->id;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max1586.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ static struct regulator_desc max1586_reg[] = {
},
};

static int __devinit max1586_pmic_probe(struct i2c_client *client,
static int max1586_pmic_probe(struct i2c_client *client,
const struct i2c_device_id *i2c_id)
{
struct regulator_dev **rdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max77686.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev,
}
#endif /* CONFIG_OF */

static __devinit int max77686_pmic_probe(struct platform_device *pdev)
static int max77686_pmic_probe(struct platform_device *pdev)
{
struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct max77686_platform_data *pdata = dev_get_platdata(iodev->dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8649.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ static struct regmap_config max8649_regmap_config = {
.val_bits = 8,
};

static int __devinit max8649_regulator_probe(struct i2c_client *client,
static int max8649_regulator_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct max8649_platform_data *pdata = client->dev.platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8660.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ static const struct regulator_desc max8660_reg[] = {
},
};

static int __devinit max8660_probe(struct i2c_client *client,
static int max8660_probe(struct i2c_client *client,
const struct i2c_device_id *i2c_id)
{
struct regulator_dev **rdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8907-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ static inline struct device_node *match_of_node(int index)
}
#endif

static __devinit int max8907_regulator_probe(struct platform_device *pdev)
static int max8907_regulator_probe(struct platform_device *pdev)
{
struct max8907 *max8907 = dev_get_drvdata(pdev->dev.parent);
struct max8907_platform_data *pdata = dev_get_platdata(max8907->dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8925-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ static int max8925_regulator_dt_init(struct platform_device *pdev,
#define max8925_regulator_dt_init(w, x, y, z) (-1)
#endif

static int __devinit max8925_regulator_probe(struct platform_device *pdev)
static int max8925_regulator_probe(struct platform_device *pdev)
{
struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct regulator_init_data *pdata = pdev->dev.platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8952.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ static const struct regulator_desc regulator = {
.owner = THIS_MODULE,
};

static int __devinit max8952_pmic_probe(struct i2c_client *client,
static int max8952_pmic_probe(struct i2c_client *client,
const struct i2c_device_id *i2c_id)
{
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8997.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@ static struct regulator_desc regulators[] = {
max8997_charger_fixedstate_ops),
};

static __devinit int max8997_pmic_probe(struct platform_device *pdev)
static int max8997_pmic_probe(struct platform_device *pdev)
{
struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct max8997_platform_data *pdata = dev_get_platdata(iodev->dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8998.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ static struct regulator_desc regulators[] = {
}
};

static __devinit int max8998_pmic_probe(struct platform_device *pdev)
static int max8998_pmic_probe(struct platform_device *pdev)
{
struct max8998_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct max8998_platform_data *pdata = dev_get_platdata(iodev->dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/mc13783-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ static struct regulator_ops mc13783_gpo_regulator_ops = {
.set_voltage = mc13xxx_fixed_regulator_set_voltage,
};

static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
static int mc13783_regulator_probe(struct platform_device *pdev)
{
struct mc13xxx_regulator_priv *priv;
struct mc13xxx *mc13783 = dev_get_drvdata(pdev->dev.parent);
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/mc13892-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ static unsigned int mc13892_vcam_get_mode(struct regulator_dev *rdev)
}


static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
static int mc13892_regulator_probe(struct platform_device *pdev)
{
struct mc13xxx_regulator_priv *priv;
struct mc13xxx *mc13892 = dev_get_drvdata(pdev->dev.parent);
Expand Down
4 changes: 2 additions & 2 deletions drivers/regulator/mc13xxx-regulator-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ struct regulator_ops mc13xxx_fixed_regulator_ops = {
EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_ops);

#ifdef CONFIG_OF
int __devinit mc13xxx_get_num_regulators_dt(struct platform_device *pdev)
int mc13xxx_get_num_regulators_dt(struct platform_device *pdev)
{
struct device_node *parent, *child;
int num = 0;
Expand All @@ -179,7 +179,7 @@ int __devinit mc13xxx_get_num_regulators_dt(struct platform_device *pdev)
}
EXPORT_SYMBOL_GPL(mc13xxx_get_num_regulators_dt);

struct mc13xxx_regulator_init_data * __devinit mc13xxx_parse_regulators_dt(
struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(
struct platform_device *pdev, struct mc13xxx_regulator *regulators,
int num_regulators)
{
Expand Down
4 changes: 2 additions & 2 deletions drivers/regulator/palmas-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ static struct of_regulator_match palmas_matches[] = {
{ .name = "ldousb", },
};

static void __devinit palmas_dt_to_pdata(struct device *dev,
static void palmas_dt_to_pdata(struct device *dev,
struct device_node *node,
struct palmas_pmic_platform_data *pdata)
{
Expand Down Expand Up @@ -663,7 +663,7 @@ static void __devinit palmas_dt_to_pdata(struct device *dev,
}


static __devinit int palmas_probe(struct platform_device *pdev)
static int palmas_probe(struct platform_device *pdev)
{
struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
struct palmas_pmic_platform_data *pdata = pdev->dev.platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/pcap-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ static const struct regulator_desc pcap_regulators[] = {
VREG(VAUX4), VREG(VSIM), VREG(VSIM2), VREG(VVIB), VREG(SW1), VREG(SW2),
};

static int __devinit pcap_regulator_probe(struct platform_device *pdev)
static int pcap_regulator_probe(struct platform_device *pdev)
{
struct regulator_dev *rdev;
void *pcap = dev_get_drvdata(pdev->dev.parent);
Expand Down
Loading

0 comments on commit a502357

Please sign in to comment.