summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-07-12 09:37:37 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-12 18:06:48 +0100
commit232b25047515127cdf1a84c09de79570de7e4d78 (patch)
tree70298c28b9d8894c65d7ee711c3f27c01feb3676 /drivers
parent2693fcab1acf6d6d5cb6d1c4dc9bb8a32e13f782 (diff)
downloadlinux-3.10-232b25047515127cdf1a84c09de79570de7e4d78.tar.gz
linux-3.10-232b25047515127cdf1a84c09de79570de7e4d78.tar.bz2
linux-3.10-232b25047515127cdf1a84c09de79570de7e4d78.zip
regulator: s2mps11: Fix wrong setting for config.dev
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/regulator/s2mps11.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index da8c3d1e1f5..b3c27058f2a 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -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;
@@ -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;
@@ -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);
}
@@ -293,11 +289,11 @@ 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;
@@ -305,8 +301,8 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
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;
}