diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:46 +0100 |
| commit | fbf6630d707c0776dacbaee0c444fb4c61e4f939 (patch) | |
| tree | 6a4683299f31ff673f9aad38515f62fe792dc60e /drivers/regulator | |
| parent | ae5f5203e5ea2a50e90bdd3a6f2a2a2d0b2d56d5 (diff) | |
| parent | bcffe53fcb96efe326a909dece5f32e1dd8eaa6a (diff) | |
Merge remote-tracking branch 'regulator/topic/rc5t583' into v3.9-rc8
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/rc5t583-regulator.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/regulator/rc5t583-regulator.c b/drivers/regulator/rc5t583-regulator.c index 9e6f78694bf..5885b450459 100644 --- a/drivers/regulator/rc5t583-regulator.c +++ b/drivers/regulator/rc5t583-regulator.c @@ -49,10 +49,6 @@ struct rc5t583_regulator_info { struct rc5t583_regulator { struct rc5t583_regulator_info *reg_info; - - /* Devices */ - struct device *dev; - struct rc5t583 *mfd; struct regulator_dev *rdev; }; @@ -155,8 +151,6 @@ static int rc5t583_regulator_probe(struct platform_device *pdev) reg = ®s[id]; ri = &rc5t583_reg_info[id]; reg->reg_info = ri; - reg->mfd = rc5t583; - reg->dev = &pdev->dev; if (ri->deepsleep_id == RC5T583_DS_NONE) goto skip_ext_pwr_config; |