aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2016-02-25 01:40:09 -0500
committerMark Brown <broonie@kernel.org>2016-02-25 20:36:54 -0500
commitaad76f743b040fe1b113691e92a2983b39c1f114 (patch)
treef86467d9b75543e461d96ae7ed85b7673e31fb1b
parent47dbdbf64fd664eae237ef9b94f4bf89093fa5a3 (diff)
regulator: max77620: Eliminate duplicate code
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/regulator/max77620-regulator.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c
index 761eb965f901..0eb5d18999e6 100644
--- a/drivers/regulator/max77620-regulator.c
+++ b/drivers/regulator/max77620-regulator.c
@@ -264,15 +264,15 @@ static int max77620_read_slew_rate(struct max77620_regulator *pmic, int id)
264 int slew_rate; 264 int slew_rate;
265 int ret; 265 int ret;
266 266
267 ret = regmap_read(pmic->rmap, rinfo->cfg_addr, &rval);
268 if (ret < 0) {
269 dev_err(pmic->dev, "Register 0x%02x read failed: %d\n",
270 rinfo->cfg_addr, ret);
271 return ret;
272 }
273
267 switch (rinfo->type) { 274 switch (rinfo->type) {
268 case MAX77620_REGULATOR_TYPE_SD: 275 case MAX77620_REGULATOR_TYPE_SD:
269 ret = regmap_read(pmic->rmap, rinfo->cfg_addr, &rval);
270 if (ret < 0) {
271 dev_err(pmic->dev, "Register 0x%02x read failed: %d\n",
272 rinfo->cfg_addr, ret);
273 return ret;
274 }
275
276 slew_rate = (rval >> MAX77620_SD_SR_SHIFT) & 0x3; 276 slew_rate = (rval >> MAX77620_SD_SR_SHIFT) & 0x3;
277 switch (slew_rate) { 277 switch (slew_rate) {
278 case 0: 278 case 0:
@@ -291,12 +291,6 @@ static int max77620_read_slew_rate(struct max77620_regulator *pmic, int id)
291 rinfo->desc.ramp_delay = slew_rate; 291 rinfo->desc.ramp_delay = slew_rate;
292 break; 292 break;
293 default: 293 default:
294 ret = regmap_read(pmic->rmap, rinfo->cfg_addr, &rval);
295 if (ret < 0) {
296 dev_err(pmic->dev, "Register 0x%02x read failed: %d\n",
297 rinfo->cfg_addr, ret);
298 return ret;
299 }
300 slew_rate = rval & 0x1; 294 slew_rate = rval & 0x1;
301 switch (slew_rate) { 295 switch (slew_rate) {
302 case 0: 296 case 0: