forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regulator: pass additional of_node to regulator_register()

Browse source 
With device tree support for regulators, its needed that the
regulator_dev->dev device has the right of_node attached.
To be able to do this add an additional parameter to the
regulator_register() api, wherein the dt-adapted driver can
then pass this additional info onto the regulator core.

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Rajendra Nayak 2011-11-18 16:47:19 +05:30 • committed by Mark Brown
commit 2c043bcbf2
41 changed files with 48 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/regulator/88pm8607.c
View file

@ -427,7 +427,7 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
/* replace driver_data with info */ /* replace driver_data with info */
info->regulator = regulator_register(&info->desc, &pdev->dev, info->regulator = regulator_register(&info->desc, &pdev->dev,
pdata, info); pdata, info, NULL);
if (IS_ERR(info->regulator)) { if (IS_ERR(info->regulator)) {
dev_err(&pdev->dev, "failed to register regulator %s\n", dev_err(&pdev->dev, "failed to register regulator %s\n",
info->desc.name); info->desc.name);

2
drivers/regulator/aat2870-regulator.c
View file

@ -188,7 +188,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev)
ri->pdev = pdev; ri->pdev = pdev;
rdev = regulator_register(&ri->desc, &pdev->dev, rdev = regulator_register(&ri->desc, &pdev->dev,
pdev->dev.platform_data, ri); pdev->dev.platform_data, ri, NULL);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(&pdev->dev, "Failed to register regulator %s\n", dev_err(&pdev->dev, "Failed to register regulator %s\n",
ri->desc.name); ri->desc.name);

2
drivers/regulator/ab3100.c
View file

@ -634,7 +634,7 @@ static int __devinit ab3100_regulators_probe(struct platform_device *pdev)
rdev = regulator_register(&ab3100_regulator_desc[i], rdev = regulator_register(&ab3100_regulator_desc[i],
&pdev->dev, &pdev->dev,
&plfdata->reg_constraints[i], &plfdata->reg_constraints[i],
reg); reg, NULL);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
err = PTR_ERR(rdev); err = PTR_ERR(rdev);

2
drivers/regulator/ab8500.c
View file

@ -822,7 +822,7 @@ static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
/* register regulator with framework */ /* register regulator with framework */
info->regulator = regulator_register(&info->desc, &pdev->dev, info->regulator = regulator_register(&info->desc, &pdev->dev,
&pdata->regulator[i], info); &pdata->regulator[i], info, NULL);
if (IS_ERR(info->regulator)) { if (IS_ERR(info->regulator)) {
err = PTR_ERR(info->regulator); err = PTR_ERR(info->regulator);
dev_err(&pdev->dev, "failed to register regulator %s\n", dev_err(&pdev->dev, "failed to register regulator %s\n",

2
drivers/regulator/ad5398.c
View file

@ -233,7 +233,7 @@ static int __devinit ad5398_probe(struct i2c_client *client,
chip->current_mask = (chip->current_level - 1) << chip->current_offset; chip->current_mask = (chip->current_level - 1) << chip->current_offset;
chip->rdev = regulator_register(&ad5398_reg, &client->dev, chip->rdev = regulator_register(&ad5398_reg, &client->dev,
init_data, chip); init_data, chip, NULL);
if (IS_ERR(chip->rdev)) { if (IS_ERR(chip->rdev)) {
ret = PTR_ERR(chip->rdev); ret = PTR_ERR(chip->rdev);
dev_err(&client->dev, "failed to register %s %s\n", dev_err(&client->dev, "failed to register %s %s\n",

2
drivers/regulator/bq24022.c
View file

@ -107,7 +107,7 @@ static int __init bq24022_probe(struct platform_device *pdev)
ret = gpio_direction_output(pdata->gpio_nce, 1); ret = gpio_direction_output(pdata->gpio_nce, 1);
bq24022 = regulator_register(&bq24022_desc, &pdev->dev, bq24022 = regulator_register(&bq24022_desc, &pdev->dev,
pdata->init_data, pdata); pdata->init_data, pdata, NULL);
if (IS_ERR(bq24022)) { if (IS_ERR(bq24022)) {
dev_dbg(&pdev->dev, "couldn't register regulator\n"); dev_dbg(&pdev->dev, "couldn't register regulator\n");
ret = PTR_ERR(bq24022); ret = PTR_ERR(bq24022);

3
drivers/regulator/core.c
View file

@ -2637,7 +2637,7 @@ static void rdev_init_debugfs(struct regulator_dev *rdev)
*/ */
struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
struct device *dev, const struct regulator_init_data *init_data, struct device *dev, const struct regulator_init_data *init_data,
void *driver_data) void *driver_data, struct device_node *of_node)
{ {
static atomic_t regulator_no = ATOMIC_INIT(0); static atomic_t regulator_no = ATOMIC_INIT(0);
struct regulator_dev *rdev; struct regulator_dev *rdev;
@ -2696,6 +2696,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
/* register with sysfs */ /* register with sysfs */
rdev->dev.class = &regulator_class; rdev->dev.class = &regulator_class;
rdev->dev.of_node = of_node;
rdev->dev.parent = dev; rdev->dev.parent = dev;
dev_set_name(&rdev->dev, "regulator.%d", dev_set_name(&rdev->dev, "regulator.%d",
atomic_inc_return(&regulator_no) - 1); atomic_inc_return(&regulator_no) - 1);

2
drivers/regulator/da903x.c
View file

@ -537,7 +537,7 @@ static int __devinit da903x_regulator_probe(struct platform_device *pdev)
ri->desc.ops = &da9030_regulator_ldo1_15_ops; ri->desc.ops = &da9030_regulator_ldo1_15_ops;
rdev = regulator_register(&ri->desc, &pdev->dev, rdev = regulator_register(&ri->desc, &pdev->dev,
pdev->dev.platform_data, ri); pdev->dev.platform_data, ri, NULL);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(&pdev->dev, "failed to register regulator %s\n", dev_err(&pdev->dev, "failed to register regulator %s\n",
ri->desc.name); ri->desc.name);

2
drivers/regulator/db8500-prcmu.c
View file

@ -486,7 +486,7 @@ static int __devinit db8500_regulator_probe(struct platform_device *pdev)
/* register with the regulator framework */ /* register with the regulator framework */
info->rdev = regulator_register(&info->desc, &pdev->dev, info->rdev = regulator_register(&info->desc, &pdev->dev,
init_data, info); init_data, info, NULL);
if (IS_ERR(info->rdev)) { if (IS_ERR(info->rdev)) {
err = PTR_ERR(info->rdev); err = PTR_ERR(info->rdev);
dev_err(&pdev->dev, "failed to register %s: err %i\n", dev_err(&pdev->dev, "failed to register %s: err %i\n",

2
drivers/regulator/dummy.c
View file

@ -42,7 +42,7 @@ static int __devinit dummy_regulator_probe(struct platform_device *pdev)
int ret; int ret;
dummy_regulator_rdev = regulator_register(&dummy_desc, NULL, dummy_regulator_rdev = regulator_register(&dummy_desc, NULL,
&dummy_initdata, NULL); &dummy_initdata, NULL, NULL);
if (IS_ERR(dummy_regulator_rdev)) { if (IS_ERR(dummy_regulator_rdev)) {
ret = PTR_ERR(dummy_regulator_rdev); ret = PTR_ERR(dummy_regulator_rdev);
pr_err("Failed to register regulator: %d\n", ret); pr_err("Failed to register regulator: %d\n", ret);

2
drivers/regulator/fixed.c
View file

@ -234,7 +234,7 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
} }
drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev, drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev,
config->init_data, drvdata); config->init_data, drvdata, NULL);
if (IS_ERR(drvdata->dev)) { if (IS_ERR(drvdata->dev)) {
ret = PTR_ERR(drvdata->dev); ret = PTR_ERR(drvdata->dev);
dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret); dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);

2
drivers/regulator/isl6271a-regulator.c
View file

@ -170,7 +170,7 @@ static int __devinit isl6271a_probe(struct i2c_client *i2c,
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
pmic->rdev[i] = regulator_register(&isl_rd[i], &i2c->dev, pmic->rdev[i] = regulator_register(&isl_rd[i], &i2c->dev,
init_data, pmic); init_data, pmic, NULL);
if (IS_ERR(pmic->rdev[i])) { if (IS_ERR(pmic->rdev[i])) {
dev_err(&i2c->dev, "failed to register %s\n", id->name); dev_err(&i2c->dev, "failed to register %s\n", id->name);
err = PTR_ERR(pmic->rdev[i]); err = PTR_ERR(pmic->rdev[i]);

2
drivers/regulator/lp3971.c
View file

@ -451,7 +451,7 @@ static int __devinit setup_regulators(struct lp3971 *lp3971,
for (i = 0; i < pdata->num_regulators; i++) { for (i = 0; i < pdata->num_regulators; i++) {
struct lp3971_regulator_subdev *reg = &pdata->regulators[i]; struct lp3971_regulator_subdev *reg = &pdata->regulators[i];
lp3971->rdev[i] = regulator_register(&regulators[reg->id], lp3971->rdev[i] = regulator_register(&regulators[reg->id],
lp3971->dev, reg->initdata, lp3971); lp3971->dev, reg->initdata, lp3971, NULL);
if (IS_ERR(lp3971->rdev[i])) { if (IS_ERR(lp3971->rdev[i])) {
err = PTR_ERR(lp3971->rdev[i]); err = PTR_ERR(lp3971->rdev[i]);

2
drivers/regulator/lp3972.c
View file

@ -555,7 +555,7 @@ static int __devinit setup_regulators(struct lp3972 *lp3972,
for (i = 0; i < pdata->num_regulators; i++) { for (i = 0; i < pdata->num_regulators; i++) {
struct lp3972_regulator_subdev *reg = &pdata->regulators[i]; struct lp3972_regulator_subdev *reg = &pdata->regulators[i];
lp3972->rdev[i] = regulator_register(&regulators[reg->id], lp3972->rdev[i] = regulator_register(&regulators[reg->id],
lp3972->dev, reg->initdata, lp3972); lp3972->dev, reg->initdata, lp3972, NULL);
if (IS_ERR(lp3972->rdev[i])) { if (IS_ERR(lp3972->rdev[i])) {
err = PTR_ERR(lp3972->rdev[i]); err = PTR_ERR(lp3972->rdev[i]);

2
drivers/regulator/max1586.c
View file

@ -214,7 +214,7 @@ static int __devinit max1586_pmic_probe(struct i2c_client *client,
} }
rdev[i] = regulator_register(&max1586_reg[id], &client->dev, rdev[i] = regulator_register(&max1586_reg[id], &client->dev,
pdata->subdevs[i].platform_data, pdata->subdevs[i].platform_data,
max1586); max1586, NULL);
if (IS_ERR(rdev[i])) { if (IS_ERR(rdev[i])) {
ret = PTR_ERR(rdev[i]); ret = PTR_ERR(rdev[i]);
dev_err(&client->dev, "failed to register %s\n", dev_err(&client->dev, "failed to register %s\n",

2
drivers/regulator/max8649.c
View file

@ -347,7 +347,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,
} }
info->regulator = regulator_register(&dcdc_desc, &client->dev, info->regulator = regulator_register(&dcdc_desc, &client->dev,
pdata->regulator, info); pdata->regulator, info, NULL);
if (IS_ERR(info->regulator)) { if (IS_ERR(info->regulator)) {
dev_err(info->dev, "failed to register regulator %s\n", dev_err(info->dev, "failed to register regulator %s\n",
dcdc_desc.name); dcdc_desc.name);

2
drivers/regulator/max8660.c
View file

@ -449,7 +449,7 @@ static int __devinit max8660_probe(struct i2c_client *client,
rdev[i] = regulator_register(&max8660_reg[id], &client->dev, rdev[i] = regulator_register(&max8660_reg[id], &client->dev,
pdata->subdevs[i].platform_data, pdata->subdevs[i].platform_data,
max8660); max8660, NULL);
if (IS_ERR(rdev[i])) { if (IS_ERR(rdev[i])) {
ret = PTR_ERR(rdev[i]); ret = PTR_ERR(rdev[i]);
dev_err(&client->dev, "failed to register %s\n", dev_err(&client->dev, "failed to register %s\n",

2
drivers/regulator/max8925-regulator.c
View file

@ -266,7 +266,7 @@ static int __devinit max8925_regulator_probe(struct platform_device *pdev)
ri->chip = chip; ri->chip = chip;
rdev = regulator_register(&ri->desc, &pdev->dev, rdev = regulator_register(&ri->desc, &pdev->dev,
pdata->regulator[pdev->id], ri); pdata->regulator[pdev->id], ri, NULL);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(&pdev->dev, "failed to register regulator %s\n", dev_err(&pdev->dev, "failed to register regulator %s\n",
ri->desc.name); ri->desc.name);

2
drivers/regulator/max8952.c
View file

@ -208,7 +208,7 @@ static int __devinit max8952_pmic_probe(struct i2c_client *client,
max8952->pdata = pdata; max8952->pdata = pdata;
max8952->rdev = regulator_register(&regulator, max8952->dev, max8952->rdev = regulator_register(&regulator, max8952->dev,
&pdata->reg_data, max8952); &pdata->reg_data, max8952, NULL);
if (IS_ERR(max8952->rdev)) { if (IS_ERR(max8952->rdev)) {
ret = PTR_ERR(max8952->rdev); ret = PTR_ERR(max8952->rdev);

2
drivers/regulator/max8997.c
View file

@ -1146,7 +1146,7 @@ static __devinit int max8997_pmic_probe(struct platform_device *pdev)
regulators[id].n_voltages = 16; regulators[id].n_voltages = 16;
rdev[i] = regulator_register(&regulators[id], max8997->dev, rdev[i] = regulator_register(&regulators[id], max8997->dev,
pdata->regulators[i].initdata, max8997); pdata->regulators[i].initdata, max8997, NULL);
if (IS_ERR(rdev[i])) { if (IS_ERR(rdev[i])) {
ret = PTR_ERR(rdev[i]); ret = PTR_ERR(rdev[i]);
dev_err(max8997->dev, "regulator init failed for %d\n", dev_err(max8997->dev, "regulator init failed for %d\n",

2
drivers/regulator/max8998.c
View file

@ -847,7 +847,7 @@ static __devinit int max8998_pmic_probe(struct platform_device *pdev)
regulators[index].n_voltages = count; regulators[index].n_voltages = count;
} }
rdev[i] = regulator_register(&regulators[index], max8998->dev, rdev[i] = regulator_register(&regulators[index], max8998->dev,
pdata->regulators[i].initdata, max8998); pdata->regulators[i].initdata, max8998, NULL);
if (IS_ERR(rdev[i])) { if (IS_ERR(rdev[i])) {
ret = PTR_ERR(rdev[i]); ret = PTR_ERR(rdev[i]);
dev_err(max8998->dev, "regulator init failed\n"); dev_err(max8998->dev, "regulator init failed\n");

2
drivers/regulator/mc13783-regulator.c
View file

@ -357,7 +357,7 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
init_data = &pdata->regulators[i]; init_data = &pdata->regulators[i];
priv->regulators[i] = regulator_register( priv->regulators[i] = regulator_register(
&mc13783_regulators[init_data->id].desc, &mc13783_regulators[init_data->id].desc,
&pdev->dev, init_data->init_data, priv); &pdev->dev, init_data->init_data, priv, NULL);
if (IS_ERR(priv->regulators[i])) { if (IS_ERR(priv->regulators[i])) {
dev_err(&pdev->dev, "failed to register regulator %s\n", dev_err(&pdev->dev, "failed to register regulator %s\n",

2
drivers/regulator/mc13892-regulator.c
View file

@ -573,7 +573,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
init_data = &pdata->regulators[i]; init_data = &pdata->regulators[i];
priv->regulators[i] = regulator_register( priv->regulators[i] = regulator_register(
&mc13892_regulators[init_data->id].desc, &mc13892_regulators[init_data->id].desc,
&pdev->dev, init_data->init_data, priv); &pdev->dev, init_data->init_data, priv, NULL);
if (IS_ERR(priv->regulators[i])) { if (IS_ERR(priv->regulators[i])) {
dev_err(&pdev->dev, "failed to register regulator %s\n", dev_err(&pdev->dev, "failed to register regulator %s\n",

2
drivers/regulator/pcap-regulator.c
View file

@ -277,7 +277,7 @@ static int __devinit pcap_regulator_probe(struct platform_device *pdev)
void *pcap = dev_get_drvdata(pdev->dev.parent); void *pcap = dev_get_drvdata(pdev->dev.parent);
rdev = regulator_register(&pcap_regulators[pdev->id], &pdev->dev, rdev = regulator_register(&pcap_regulators[pdev->id], &pdev->dev,
pdev->dev.platform_data, pcap); pdev->dev.platform_data, pcap, NULL);
if (IS_ERR(rdev)) if (IS_ERR(rdev))
return PTR_ERR(rdev); return PTR_ERR(rdev);

2
drivers/regulator/pcf50633-regulator.c
View file

@ -320,7 +320,7 @@ static int __devinit pcf50633_regulator_probe(struct platform_device *pdev)
pcf = dev_to_pcf50633(pdev->dev.parent); pcf = dev_to_pcf50633(pdev->dev.parent);
rdev = regulator_register(&regulators[pdev->id], &pdev->dev, rdev = regulator_register(&regulators[pdev->id], &pdev->dev,
pdev->dev.platform_data, pcf); pdev->dev.platform_data, pcf, NULL);
if (IS_ERR(rdev)) if (IS_ERR(rdev))
return PTR_ERR(rdev); return PTR_ERR(rdev);

3
drivers/regulator/tps6105x-regulator.c
View file

@ -151,7 +151,8 @@ static int __devinit tps6105x_regulator_probe(struct platform_device *pdev)
/* Register regulator with framework */ /* Register regulator with framework */
tps6105x->regulator = regulator_register(&tps6105x_regulator_desc, tps6105x->regulator = regulator_register(&tps6105x_regulator_desc,
&tps6105x->client->dev, &tps6105x->client->dev,
pdata->regulator_data, tps6105x); pdata->regulator_data, tps6105x,
NULL);
if (IS_ERR(tps6105x->regulator)) { if (IS_ERR(tps6105x->regulator)) {
ret = PTR_ERR(tps6105x->regulator); ret = PTR_ERR(tps6105x->regulator);
dev_err(&tps6105x->client->dev, dev_err(&tps6105x->client->dev,

2
drivers/regulator/tps65023-regulator.c
View file

@ -496,7 +496,7 @@ static int __devinit tps_65023_probe(struct i2c_client *client,
/* Register the regulators */ /* Register the regulators */
rdev = regulator_register(&tps->desc[i], &client->dev, rdev = regulator_register(&tps->desc[i], &client->dev,
init_data, tps); init_data, tps, NULL);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(&client->dev, "failed to register %s\n", dev_err(&client->dev, "failed to register %s\n",
id->name); id->name);

2
drivers/regulator/tps6507x-regulator.c
View file

@ -599,7 +599,7 @@ int tps6507x_pmic_probe(struct platform_device *pdev)
tps->desc[i].owner = THIS_MODULE; tps->desc[i].owner = THIS_MODULE;
rdev = regulator_register(&tps->desc[i], rdev = regulator_register(&tps->desc[i],
tps6507x_dev->dev, init_data, tps); tps6507x_dev->dev, init_data, tps, NULL);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(tps6507x_dev->dev, dev_err(tps6507x_dev->dev,
"failed to register %s regulator\n", "failed to register %s regulator\n",

2
drivers/regulator/tps6524x-regulator.c
View file

@ -651,7 +651,7 @@ static int __devinit pmic_probe(struct spi_device *spi)
hw->desc[i].n_voltages = 1; hw->desc[i].n_voltages = 1;
hw->rdev[i] = regulator_register(&hw->desc[i], dev, hw->rdev[i] = regulator_register(&hw->desc[i], dev,
init_data, hw); init_data, hw, NULL);
if (IS_ERR(hw->rdev[i])) { if (IS_ERR(hw->rdev[i])) {
ret = PTR_ERR(hw->rdev[i]); ret = PTR_ERR(hw->rdev[i]);
hw->rdev[i] = NULL; hw->rdev[i] = NULL;

2
drivers/regulator/tps6586x-regulator.c
View file

@ -396,7 +396,7 @@ static int __devinit tps6586x_regulator_probe(struct platform_device *pdev)
return err; return err;
rdev = regulator_register(&ri->desc, &pdev->dev, rdev = regulator_register(&ri->desc, &pdev->dev,
pdev->dev.platform_data, ri); pdev->dev.platform_data, ri, NULL);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(&pdev->dev, "failed to register regulator %s\n", dev_err(&pdev->dev, "failed to register regulator %s\n",
ri->desc.name); ri->desc.name);

2
drivers/regulator/tps65910-regulator.c
View file

@ -963,7 +963,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
pmic->desc[i].owner = THIS_MODULE; pmic->desc[i].owner = THIS_MODULE;
rdev = regulator_register(&pmic->desc[i], rdev = regulator_register(&pmic->desc[i],
tps65910->dev, reg_data, pmic); tps65910->dev, reg_data, pmic, NULL);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(tps65910->dev, dev_err(tps65910->dev,
"failed to register %s regulator\n", "failed to register %s regulator\n",

2
drivers/regulator/tps65912-regulator.c
View file

@ -727,7 +727,7 @@ static __devinit int tps65912_probe(struct platform_device *pdev)
pmic->desc[i].owner = THIS_MODULE; pmic->desc[i].owner = THIS_MODULE;
range = tps65912_get_range(pmic, i); range = tps65912_get_range(pmic, i);
rdev = regulator_register(&pmic->desc[i], rdev = regulator_register(&pmic->desc[i],
tps65912->dev, reg_data, pmic); tps65912->dev, reg_data, pmic, NULL);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(tps65912->dev, dev_err(tps65912->dev,
"failed to register %s regulator\n", "failed to register %s regulator\n",

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

@ -1070,7 +1070,7 @@ static int __devinit twlreg_probe(struct platform_device *pdev)
break; break;
} }
rdev = regulator_register(&info->desc, &pdev->dev, initdata, info); rdev = regulator_register(&info->desc, &pdev->dev, initdata, info, NULL);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(&pdev->dev, "can't register %s, %ld\n", dev_err(&pdev->dev, "can't register %s, %ld\n",
info->desc.name, PTR_ERR(rdev)); info->desc.name, PTR_ERR(rdev));

8
drivers/regulator/wm831x-dcdc.c
View file

@ -553,7 +553,7 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
wm831x_buckv_dvs_init(dcdc, pdata->dcdc[id]->driver_data); wm831x_buckv_dvs_init(dcdc, pdata->dcdc[id]->driver_data);
dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev, dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev,
pdata->dcdc[id], dcdc); pdata->dcdc[id], dcdc, NULL);
if (IS_ERR(dcdc->regulator)) { if (IS_ERR(dcdc->regulator)) {
ret = PTR_ERR(dcdc->regulator); ret = PTR_ERR(dcdc->regulator);
dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n", dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n",
@ -747,7 +747,7 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)
dcdc->desc.owner = THIS_MODULE; dcdc->desc.owner = THIS_MODULE;
dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev, dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev,
pdata->dcdc[id], dcdc); pdata->dcdc[id], dcdc, NULL);
if (IS_ERR(dcdc->regulator)) { if (IS_ERR(dcdc->regulator)) {
ret = PTR_ERR(dcdc->regulator); ret = PTR_ERR(dcdc->regulator);
dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n", dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n",
@ -874,7 +874,7 @@ static __devinit int wm831x_boostp_probe(struct platform_device *pdev)
dcdc->desc.owner = THIS_MODULE; dcdc->desc.owner = THIS_MODULE;
dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev, dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev,
pdata->dcdc[id], dcdc); pdata->dcdc[id], dcdc, NULL);
if (IS_ERR(dcdc->regulator)) { if (IS_ERR(dcdc->regulator)) {
ret = PTR_ERR(dcdc->regulator); ret = PTR_ERR(dcdc->regulator);
dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n", dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n",
@ -973,7 +973,7 @@ static __devinit int wm831x_epe_probe(struct platform_device *pdev)
dcdc->desc.owner = THIS_MODULE; dcdc->desc.owner = THIS_MODULE;
dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev, dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev,
pdata->epe[id], dcdc); pdata->epe[id], dcdc, NULL);
if (IS_ERR(dcdc->regulator)) { if (IS_ERR(dcdc->regulator)) {
ret = PTR_ERR(dcdc->regulator); ret = PTR_ERR(dcdc->regulator);
dev_err(wm831x->dev, "Failed to register EPE%d: %d\n", dev_err(wm831x->dev, "Failed to register EPE%d: %d\n",

2
drivers/regulator/wm831x-isink.c
View file

@ -189,7 +189,7 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)
isink->desc.owner = THIS_MODULE; isink->desc.owner = THIS_MODULE;
isink->regulator = regulator_register(&isink->desc, &pdev->dev, isink->regulator = regulator_register(&isink->desc, &pdev->dev,
pdata->isink[id], isink); pdata->isink[id], isink, NULL);
if (IS_ERR(isink->regulator)) { if (IS_ERR(isink->regulator)) {
ret = PTR_ERR(isink->regulator); ret = PTR_ERR(isink->regulator);
dev_err(wm831x->dev, "Failed to register ISINK%d: %d\n", dev_err(wm831x->dev, "Failed to register ISINK%d: %d\n",

6
drivers/regulator/wm831x-ldo.c
View file

@ -351,7 +351,7 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)
ldo->desc.owner = THIS_MODULE; ldo->desc.owner = THIS_MODULE;
ldo->regulator = regulator_register(&ldo->desc, &pdev->dev, ldo->regulator = regulator_register(&ldo->desc, &pdev->dev,
pdata->ldo[id], ldo); pdata->ldo[id], ldo, NULL);
if (IS_ERR(ldo->regulator)) { if (IS_ERR(ldo->regulator)) {
ret = PTR_ERR(ldo->regulator); ret = PTR_ERR(ldo->regulator);
dev_err(wm831x->dev, "Failed to register LDO%d: %d\n", dev_err(wm831x->dev, "Failed to register LDO%d: %d\n",
@ -621,7 +621,7 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)
ldo->desc.owner = THIS_MODULE; ldo->desc.owner = THIS_MODULE;
ldo->regulator = regulator_register(&ldo->desc, &pdev->dev, ldo->regulator = regulator_register(&ldo->desc, &pdev->dev,
pdata->ldo[id], ldo); pdata->ldo[id], ldo, NULL);
if (IS_ERR(ldo->regulator)) { if (IS_ERR(ldo->regulator)) {
ret = PTR_ERR(ldo->regulator); ret = PTR_ERR(ldo->regulator);
dev_err(wm831x->dev, "Failed to register LDO%d: %d\n", dev_err(wm831x->dev, "Failed to register LDO%d: %d\n",
@ -818,7 +818,7 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)
ldo->desc.owner = THIS_MODULE; ldo->desc.owner = THIS_MODULE;
ldo->regulator = regulator_register(&ldo->desc, &pdev->dev, ldo->regulator = regulator_register(&ldo->desc, &pdev->dev,
pdata->ldo[id], ldo); pdata->ldo[id], ldo, NULL);
if (IS_ERR(ldo->regulator)) { if (IS_ERR(ldo->regulator)) {
ret = PTR_ERR(ldo->regulator); ret = PTR_ERR(ldo->regulator);
dev_err(wm831x->dev, "Failed to register LDO%d: %d\n", dev_err(wm831x->dev, "Failed to register LDO%d: %d\n",

2
drivers/regulator/wm8350-regulator.c
View file

@ -1428,7 +1428,7 @@ static int wm8350_regulator_probe(struct platform_device *pdev)
/* register regulator */ /* register regulator */
rdev = regulator_register(&wm8350_reg[pdev->id], &pdev->dev, rdev = regulator_register(&wm8350_reg[pdev->id], &pdev->dev,
pdev->dev.platform_data, pdev->dev.platform_data,
dev_get_drvdata(&pdev->dev)); dev_get_drvdata(&pdev->dev), NULL);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(&pdev->dev, "failed to register %s\n", dev_err(&pdev->dev, "failed to register %s\n",
wm8350_reg[pdev->id].name); wm8350_reg[pdev->id].name);

2
drivers/regulator/wm8400-regulator.c
View file

@ -326,7 +326,7 @@ static int __devinit wm8400_regulator_probe(struct platform_device *pdev)
struct regulator_dev *rdev; struct regulator_dev *rdev;
rdev = regulator_register(&regulators[pdev->id], &pdev->dev, rdev = regulator_register(&regulators[pdev->id], &pdev->dev,
pdev->dev.platform_data, wm8400); pdev->dev.platform_data, wm8400, NULL);
if (IS_ERR(rdev)) if (IS_ERR(rdev))
return PTR_ERR(rdev); return PTR_ERR(rdev);

2
drivers/regulator/wm8994-regulator.c
View file

@ -269,7 +269,7 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)
ldo->is_enabled = true; ldo->is_enabled = true;
ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &pdev->dev, ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &pdev->dev,
pdata->ldo[id].init_data, ldo); pdata->ldo[id].init_data, ldo, NULL);
if (IS_ERR(ldo->regulator)) { if (IS_ERR(ldo->regulator)) {
ret = PTR_ERR(ldo->regulator); ret = PTR_ERR(ldo->regulator);
dev_err(wm8994->dev, "Failed to register LDO%d: %d\n", dev_err(wm8994->dev, "Failed to register LDO%d: %d\n",

2
include/linux/regulator/driver.h
View file

@ -212,7 +212,7 @@ struct regulator_dev {
struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
struct device *dev, const struct regulator_init_data *init_data, struct device *dev, const struct regulator_init_data *init_data,
void *driver_data); void *driver_data, struct device_node *of_node);
void regulator_unregister(struct regulator_dev *rdev); void regulator_unregister(struct regulator_dev *rdev);
int regulator_notifier_call_chain(struct regulator_dev *rdev, int regulator_notifier_call_chain(struct regulator_dev *rdev,

2
sound/soc/codecs/sgtl5000.c
View file

@ -833,7 +833,7 @@ static int ldo_regulator_register(struct snd_soc_codec *codec,
ldo->voltage = voltage; ldo->voltage = voltage;
ldo->dev = regulator_register(&ldo->desc, codec->dev, ldo->dev = regulator_register(&ldo->desc, codec->dev,
init_data, ldo); init_data, ldo, NULL);
if (IS_ERR(ldo->dev)) { if (IS_ERR(ldo->dev)) {
int ret = PTR_ERR(ldo->dev); int ret = PTR_ERR(ldo->dev);