aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2013-04-27 21:13:46 -0400
committerMark Brown <broonie@sirena.org.uk>2013-04-27 21:13:46 -0400
commitfbf6630d707c0776dacbaee0c444fb4c61e4f939 (patch)
tree6a4683299f31ff673f9aad38515f62fe792dc60e /drivers/regulator
parentae5f5203e5ea2a50e90bdd3a6f2a2a2d0b2d56d5 (diff)
parentbcffe53fcb96efe326a909dece5f32e1dd8eaa6a (diff)
Merge remote-tracking branch 'regulator/topic/rc5t583' into v3.9-rc8
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/rc5t583-regulator.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/regulator/rc5t583-regulator.c b/drivers/regulator/rc5t583-regulator.c
index 9e6f78694bf1..5885b4504596 100644
--- a/drivers/regulator/rc5t583-regulator.c
+++ b/drivers/regulator/rc5t583-regulator.c
@@ -49,10 +49,6 @@ struct rc5t583_regulator_info {
49 49
50struct rc5t583_regulator { 50struct rc5t583_regulator {
51 struct rc5t583_regulator_info *reg_info; 51 struct rc5t583_regulator_info *reg_info;
52
53 /* Devices */
54 struct device *dev;
55 struct rc5t583 *mfd;
56 struct regulator_dev *rdev; 52 struct regulator_dev *rdev;
57}; 53};
58 54
@@ -155,8 +151,6 @@ static int rc5t583_regulator_probe(struct platform_device *pdev)
155 reg = &regs[id]; 151 reg = &regs[id];
156 ri = &rc5t583_reg_info[id]; 152 ri = &rc5t583_reg_info[id];
157 reg->reg_info = ri; 153 reg->reg_info = ri;
158 reg->mfd = rc5t583;
159 reg->dev = &pdev->dev;
160 154
161 if (ri->deepsleep_id == RC5T583_DS_NONE) 155 if (ri->deepsleep_id == RC5T583_DS_NONE)
162 goto skip_ext_pwr_config; 156 goto skip_ext_pwr_config;