summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-09-05 03:17:41 +0200
committerMark Brown <broonie@kernel.org>2014-09-05 12:34:12 +0200
commitda0bb557ba0b5985631a98b7450d256251e7fb5d (patch)
tree0654135e9103300b2fc3ad1dc5a8ee1eb65ca709 /drivers/regulator
parentregulator: max77802: set opmode to normal if off is read from hw (diff)
downloadlinux-da0bb557ba0b5985631a98b7450d256251e7fb5d.tar.xz
linux-da0bb557ba0b5985631a98b7450d256251e7fb5d.zip
regulator: max77802: Remove duplicate rdev_get_id() call
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/max77802.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/max77802.c b/drivers/regulator/max77802.c
index 967e10934d3e..d89792b084e9 100644
--- a/drivers/regulator/max77802.c
+++ b/drivers/regulator/max77802.c
@@ -134,7 +134,7 @@ static int max77802_ldo_set_suspend_mode_logic1(struct regulator_dev *rdev,
return -EINVAL;
}
- max77802->opmode[rdev_get_id(rdev)] = val;
+ max77802->opmode[id] = val;
return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,
rdev->desc->enable_mask, val << shift);
}
@@ -167,7 +167,7 @@ static int max77802_ldo_set_suspend_mode_logic2(struct regulator_dev *rdev,
return -EINVAL;
}
- max77802->opmode[rdev_get_id(rdev)] = val;
+ max77802->opmode[id] = val;
return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,
rdev->desc->enable_mask, val << shift);
}