Skip to content

Commit

Permalink
regulator: s2mps11: Fix wrong setting for config.dev
Browse files Browse the repository at this point in the history
Currently s2mps11->iodev, s2mps11->dev and config.dev point to NULL.
This patch fixes the settings for config.dev.
Current code does not need the *dev and *iodev of struct s2mps11_info,
so remove them.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Jul 12, 2012
1 parent 2693fca commit 232b250
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions drivers/regulator/s2mps11.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
#include <linux/mfd/samsung/s2mps11.h>

struct s2mps11_info {
struct device *dev;
struct sec_pmic_dev *iodev;
struct regulator_dev **rdev;

int ramp_delay2;
Expand Down Expand Up @@ -260,8 +258,6 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
}

rdev = s2mps11->rdev;
config.dev = &pdev->dev;
config.regmap = iodev->regmap;
platform_set_drvdata(pdev, s2mps11);

s2mps11->ramp_delay2 = pdata->buck2_ramp_delay;
Expand All @@ -284,7 +280,7 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
ramp_reg |= get_ramp_delay(s2mps11->ramp_delay2) >> 6;
if (s2mps11->buck3_ramp || s2mps11->buck4_ramp)
ramp_reg |= get_ramp_delay(s2mps11->ramp_delay34) >> 4;
sec_reg_update(s2mps11->iodev, S2MPS11_REG_RAMP,
sec_reg_update(iodev, S2MPS11_REG_RAMP,
ramp_reg | ramp_enable, 0xff);
}

Expand All @@ -293,20 +289,20 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
ramp_reg |= get_ramp_delay(s2mps11->ramp_delay16) >> 4;
ramp_reg |= get_ramp_delay(s2mps11->ramp_delay7810) >> 2;
ramp_reg |= get_ramp_delay(s2mps11->ramp_delay9);
sec_reg_update(s2mps11->iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg, 0xff);
sec_reg_update(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg, 0xff);

for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {

config.dev = s2mps11->dev;
config.dev = &pdev->dev;
config.regmap = iodev->regmap;
config.init_data = pdata->regulators[i].initdata;
config.driver_data = s2mps11;

rdev[i] = regulator_register(&regulators[i], &config);
if (IS_ERR(rdev[i])) {
ret = PTR_ERR(rdev[i]);
dev_err(s2mps11->dev, "regulator init failed for %d\n",
i);
dev_err(&pdev->dev, "regulator init failed for %d\n",
i);
rdev[i] = NULL;
goto err;
}
Expand Down

0 comments on commit 232b250

Please sign in to comment.