summaryrefslogtreecommitdiff
path: root/drivers/regulator/ab8500-ext.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-04-16 19:33:00 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-17 18:08:38 +0400
commit7384744d2de1638b5aa9cbe9f743e9067cb6a44a (patch)
treeb72a1ef4c0788f57d0b1d54bb2d1e8c8e16682e7 /drivers/regulator/ab8500-ext.c
parent66511fa4a7902fb9ffdffc8c153f1758817fb8a4 (diff)
downloadlinux-7384744d2de1638b5aa9cbe9f743e9067cb6a44a.tar.xz
regulator: ab8500-ext: Remove enable() and disable() functions
Both enable() and disable() functions have only one caller, thus remove them. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/ab8500-ext.c')
-rw-r--r--drivers/regulator/ab8500-ext.c64
1 files changed, 23 insertions, 41 deletions
diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
index 03faf9c698c4..b4d45472aae6 100644
--- a/drivers/regulator/ab8500-ext.c
+++ b/drivers/regulator/ab8500-ext.c
@@ -54,32 +54,44 @@ struct ab8500_ext_regulator_info {
u8 update_val_hw;
};
-static int enable(struct ab8500_ext_regulator_info *info, u8 *regval)
+static int ab8500_ext_regulator_enable(struct regulator_dev *rdev)
{
int ret;
+ struct ab8500_ext_regulator_info *info = rdev_get_drvdata(rdev);
+ u8 regval;
- *regval = info->update_val;
+ if (info == NULL) {
+ dev_err(rdev_get_dev(rdev), "regulator info null pointer\n");
+ return -EINVAL;
+ }
/*
* To satisfy both HW high power request and SW request, the regulator
* must be on in high power.
*/
if (info->cfg && info->cfg->hwreq)
- *regval = info->update_val_hp;
+ regval = info->update_val_hp;
+ else
+ regval = info->update_val;
ret = abx500_mask_and_set_register_interruptible(info->dev,
info->update_bank, info->update_reg,
- info->update_mask, *regval);
+ info->update_mask, regval);
if (ret < 0) {
dev_err(rdev_get_dev(info->rdev),
"couldn't set enable bits for regulator\n");
return ret;
}
- return ret;
+ dev_dbg(rdev_get_dev(rdev),
+ "%s-enable (bank, reg, mask, value): 0x%02x, 0x%02x, 0x%02x, 0x%02x\n",
+ info->desc.name, info->update_bank, info->update_reg,
+ info->update_mask, regval);
+
+ return 0;
}
-static int ab8500_ext_regulator_enable(struct regulator_dev *rdev)
+static int ab8500_ext_regulator_disable(struct regulator_dev *rdev)
{
int ret;
struct ab8500_ext_regulator_info *info = rdev_get_drvdata(rdev);
@@ -90,59 +102,29 @@ static int ab8500_ext_regulator_enable(struct regulator_dev *rdev)
return -EINVAL;
}
- ret = enable(info, &regval);
-
- dev_dbg(rdev_get_dev(rdev), "%s-enable (bank, reg, mask, value):"
- " 0x%02x, 0x%02x, 0x%02x, 0x%02x\n",
- info->desc.name, info->update_bank, info->update_reg,
- info->update_mask, regval);
-
- return ret;
-}
-
-static int disable(struct ab8500_ext_regulator_info *info, u8 *regval)
-{
- int ret;
-
- *regval = 0x0;
-
/*
* Set the regulator in HW request mode if configured
*/
if (info->cfg && info->cfg->hwreq)
- *regval = info->update_val_hw;
+ regval = info->update_val_hw;
+ else
+ regval = 0;
ret = abx500_mask_and_set_register_interruptible(info->dev,
info->update_bank, info->update_reg,
- info->update_mask, *regval);
+ info->update_mask, regval);
if (ret < 0) {
dev_err(rdev_get_dev(info->rdev),
"couldn't set disable bits for regulator\n");
return ret;
}
- return ret;
-}
-
-static int ab8500_ext_regulator_disable(struct regulator_dev *rdev)
-{
- int ret;
- struct ab8500_ext_regulator_info *info = rdev_get_drvdata(rdev);
- u8 regval;
-
- if (info == NULL) {
- dev_err(rdev_get_dev(rdev), "regulator info null pointer\n");
- return -EINVAL;
- }
-
- ret = disable(info, &regval);
-
dev_dbg(rdev_get_dev(rdev), "%s-disable (bank, reg, mask, value):"
" 0x%02x, 0x%02x, 0x%02x, 0x%02x\n",
info->desc.name, info->update_bank, info->update_reg,
info->update_mask, regval);
- return ret;
+ return 0;
}
static int ab8500_ext_regulator_is_enabled(struct regulator_dev *rdev)