Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbf6630d authored by Mark Brown's avatar Mark Brown
Browse files

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

parents ae5f5203 bcffe53f

drivers/regulator/rc5t583-regulator.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -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;