From: Axel Lin Date: Thu, 12 Jul 2012 01:39:10 +0000 (+0800) Subject: regulator: s2mps11: Use sec_reg_write rather than sec_reg_update when mask is 0xff X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c06eed397a174d9762f1c8a72fc88259f3641af2;p=linux-beck.git regulator: s2mps11: Use sec_reg_write rather than sec_reg_update when mask is 0xff Signed-off-by: Axel Lin Acked-by: Sangbeom Kim Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index b3c27058f2a6..4669dc9ac74a 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c @@ -280,8 +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(iodev, S2MPS11_REG_RAMP, - ramp_reg | ramp_enable, 0xff); + sec_reg_write(iodev, S2MPS11_REG_RAMP, ramp_reg | ramp_enable); } ramp_reg &= 0x00; @@ -289,7 +288,7 @@ 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(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg, 0xff); + sec_reg_write(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg); for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {