Skip to content

Commit

Permalink
regulator: wm831x: Register all normal regulators
Browse files Browse the repository at this point in the history 
Register all normal regulators rather than skipping unconfigured ones now
that the core can handle regulators without init data. Skip the boost and
isink regulators since they are normally controlled by other drivers.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed May 9, 2012
1 parent c006b21 commit b7ca878
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 24 deletions.
18 changes: 6 additions & 12 deletions drivers/regulator/wm831x-dcdc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,9 +477,6 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)

dev_dbg(&pdev->dev, "Probing DCDC%d\n", id + 1);

if (pdata == NULL || pdata->dcdc[id] == NULL)
return -ENODEV;

dcdc = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_dcdc),
GFP_KERNEL);
if (dcdc == NULL) {
Expand Down Expand Up @@ -525,7 +522,8 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
wm831x_buckv_dvs_init(dcdc, pdata->dcdc[id]->driver_data);

config.dev = pdev->dev.parent;
config.init_data = pdata->dcdc[id];
if (pdata)
config.init_data = pdata->dcdc[id];
config.driver_data = dcdc;
config.regmap = wm831x->regmap;

Expand Down Expand Up @@ -680,9 +678,6 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)

dev_dbg(&pdev->dev, "Probing DCDC%d\n", id + 1);

if (pdata == NULL || pdata->dcdc[id] == NULL)
return -ENODEV;

dcdc = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_dcdc),
GFP_KERNEL);
if (dcdc == NULL) {
Expand Down Expand Up @@ -713,7 +708,8 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)
dcdc->desc.enable_mask = 1 << id;

config.dev = pdev->dev.parent;
config.init_data = pdata->dcdc[id];
if (pdata)
config.init_data = pdata->dcdc[id];
config.driver_data = dcdc;
config.regmap = wm831x->regmap;

Expand Down Expand Up @@ -925,9 +921,6 @@ static __devinit int wm831x_epe_probe(struct platform_device *pdev)

dev_dbg(&pdev->dev, "Probing EPE%d\n", id + 1);

if (pdata == NULL || pdata->epe[id] == NULL)
return -ENODEV;

dcdc = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_dcdc), GFP_KERNEL);
if (dcdc == NULL) {
dev_err(&pdev->dev, "Unable to allocate private data\n");
Expand All @@ -949,7 +942,8 @@ static __devinit int wm831x_epe_probe(struct platform_device *pdev)
dcdc->desc.enable_mask = 1 << dcdc->desc.id;

config.dev = pdev->dev.parent;
config.init_data = pdata->epe[id];
if (pdata)
config.init_data = pdata->epe[id];
config.driver_data = dcdc;
config.regmap = wm831x->regmap;

Expand Down
18 changes: 6 additions & 12 deletions drivers/regulator/wm831x-ldo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,6 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)

dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);

if (pdata == NULL || pdata->ldo[id] == NULL)
return -ENODEV;

ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL);
if (ldo == NULL) {
dev_err(&pdev->dev, "Unable to allocate private data\n");
Expand Down Expand Up @@ -305,7 +302,8 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)
ldo->desc.enable_mask = 1 << id;

config.dev = pdev->dev.parent;
config.init_data = pdata->ldo[id];
if (pdata)
config.init_data = pdata->ldo[id];
config.driver_data = ldo;
config.regmap = wm831x->regmap;

Expand Down Expand Up @@ -531,9 +529,6 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)

dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);

if (pdata == NULL || pdata->ldo[id] == NULL)
return -ENODEV;

ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL);
if (ldo == NULL) {
dev_err(&pdev->dev, "Unable to allocate private data\n");
Expand Down Expand Up @@ -563,7 +558,8 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)
ldo->desc.enable_mask = 1 << id;

config.dev = pdev->dev.parent;
config.init_data = pdata->ldo[id];
if (pdata)
config.init_data = pdata->ldo[id];
config.driver_data = ldo;
config.regmap = wm831x->regmap;

Expand Down Expand Up @@ -719,9 +715,6 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)

dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);

if (pdata == NULL || pdata->ldo[id] == NULL)
return -ENODEV;

ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL);
if (ldo == NULL) {
dev_err(&pdev->dev, "Unable to allocate private data\n");
Expand Down Expand Up @@ -751,7 +744,8 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)
ldo->desc.enable_mask = 1 << id;

config.dev = pdev->dev.parent;
config.init_data = pdata->ldo[id];
if (pdata)
config.init_data = pdata->ldo[id];
config.driver_data = ldo;
config.regmap = wm831x->regmap;

Expand Down

0 comments on commit b7ca878

Please sign in to comment.