From: Axel Lin <axel.lin@gmail.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Sangbeom Kim <sbkim73@samsung.com>, Liam Girdwood <lrg@ti.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] regulator: s2mps11: Fix wrong setting for config.dev
Date: Thu, 12 Jul 2012 09:37:37 +0800 [thread overview]
Message-ID: <1342057057.19192.2.camel@phoenix> (raw)
In-Reply-To: <1342056950.19192.0.camel@phoenix>
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>
---
drivers/regulator/s2mps11.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index da8c3d1..b3c2705 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(®ulators[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;
}
--
1.7.9.5
next prev parent reply other threads:[~2012-07-12 1:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-12 1:35 [PATCH 1/3] regulator: s2mps11: Fixup missing commas Axel Lin
2012-07-12 1:37 ` Axel Lin [this message]
2012-07-12 2:25 ` [PATCH 2/3] regulator: s2mps11: Fix wrong setting for config.dev Sangbeom Kim
2012-07-12 1:39 ` [PATCH 3/3] regulator: s2mps11: Use sec_reg_write rather than sec_reg_update when mask is 0xff Axel Lin
2012-07-12 2:26 ` Sangbeom Kim
2012-07-12 2:23 ` [PATCH 1/3] regulator: s2mps11: Fixup missing commas Sangbeom Kim
2012-07-12 17:07 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1342057057.19192.2.camel@phoenix \
--to=axel.lin@gmail.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=sbkim73@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox