openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'regulator/topic/rc5t583' into v3.9-rc8

This commit is contained in:
Mark Brown 2013-04-28 02:13:46 +01:00
parent ae5f5203e5 bcffe53fcb
commit fbf6630d70
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/regulator/rc5t583-regulator.c
View File

@ -49,10 +49,6 @@ struct rc5t583_regulator_info {
struct rc5t583_regulator { struct rc5t583_regulator {
struct rc5t583_regulator_info *reg_info; struct rc5t583_regulator_info *reg_info;
/* Devices */
struct device *dev;
struct rc5t583 *mfd;
struct regulator_dev *rdev; struct regulator_dev *rdev;
}; };
@ -155,8 +151,6 @@ static int rc5t583_regulator_probe(struct platform_device *pdev)
reg = &regs[id]; reg = &regs[id];
ri = &rc5t583_reg_info[id]; ri = &rc5t583_reg_info[id];
reg->reg_info = ri; reg->reg_info = ri;
reg->mfd = rc5t583;
reg->dev = &pdev->dev;
if (ri->deepsleep_id == RC5T583_DS_NONE) if (ri->deepsleep_id == RC5T583_DS_NONE)
goto skip_ext_pwr_config; goto skip_ext_pwr_config;