| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 09 Mar 2012 07:05:41 +0800
From: Axel Lin <axel.lin@...il.com>
To: linux-kernel@...r.kernel.org
Cc: Margarita Olaya Cabrera <magi@...mlogic.co.uk>,
Liam Girdwood <lrg@...com>,
Mark Brown <broonie@...nsource.wolfsonmicro.com>
Subject: [PATCH] regulator: Use array to store dcdc_range settings for
tps65912
Then we can use the regulator id as array index to access the array.
This change makes the code simpler.
Signed-off-by: Axel Lin <axel.lin@...il.com>
---
drivers/regulator/tps65912-regulator.c | 70 +++++++++-----------------------
1 files changed, 20 insertions(+), 50 deletions(-)
diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c
index b685757..a654602 100644
--- a/drivers/regulator/tps65912-regulator.c
+++ b/drivers/regulator/tps65912-regulator.c
@@ -114,10 +114,7 @@ struct tps65912_reg {
struct mutex io_lock;
int mode;
int (*get_ctrl_reg)(int);
- int dcdc1_range;
- int dcdc2_range;
- int dcdc3_range;
- int dcdc4_range;
+ int dcdc_range[TPS65912_NUM_DCDC];
int pwm_mode_reg;
int eco_reg;
};
@@ -125,46 +122,31 @@ struct tps65912_reg {
static int tps65912_get_range(struct tps65912_reg *pmic, int id)
{
struct tps65912 *mfd = pmic->mfd;
-
- if (id > TPS65912_REG_DCDC4)
- return 0;
+ int range;
switch (id) {
case TPS65912_REG_DCDC1:
- pmic->dcdc1_range = tps65912_reg_read(mfd,
- TPS65912_DCDC1_LIMIT);
- if (pmic->dcdc1_range < 0)
- return pmic->dcdc1_range;
- pmic->dcdc1_range = (pmic->dcdc1_range &
- DCDC_LIMIT_RANGE_MASK) >> DCDC_LIMIT_RANGE_SHIFT;
- return pmic->dcdc1_range;
+ range = tps65912_reg_read(mfd, TPS65912_DCDC1_LIMIT);
+ break;
case TPS65912_REG_DCDC2:
- pmic->dcdc2_range = tps65912_reg_read(mfd,
- TPS65912_DCDC2_LIMIT);
- if (pmic->dcdc2_range < 0)
- return pmic->dcdc2_range;
- pmic->dcdc2_range = (pmic->dcdc2_range &
- DCDC_LIMIT_RANGE_MASK) >> DCDC_LIMIT_RANGE_SHIFT;
- return pmic->dcdc2_range;
+ range = tps65912_reg_read(mfd, TPS65912_DCDC2_LIMIT);
+ break;
case TPS65912_REG_DCDC3:
- pmic->dcdc3_range = tps65912_reg_read(mfd,
- TPS65912_DCDC3_LIMIT);
- if (pmic->dcdc3_range < 0)
- return pmic->dcdc3_range;
- pmic->dcdc3_range = (pmic->dcdc3_range &
- DCDC_LIMIT_RANGE_MASK) >> DCDC_LIMIT_RANGE_SHIFT;
- return pmic->dcdc3_range;
+ range = tps65912_reg_read(mfd, TPS65912_DCDC3_LIMIT);
+ break;
case TPS65912_REG_DCDC4:
- pmic->dcdc4_range = tps65912_reg_read(mfd,
- TPS65912_DCDC4_LIMIT);
- if (pmic->dcdc4_range < 0)
- return pmic->dcdc4_range;
- pmic->dcdc4_range = (pmic->dcdc4_range &
- DCDC_LIMIT_RANGE_MASK) >> DCDC_LIMIT_RANGE_SHIFT;
- return pmic->dcdc4_range;
+ range = tps65912_reg_read(mfd, TPS65912_DCDC4_LIMIT);
+ break;
default:
return 0;
}
+
+ if (range >= 0)
+ range = (range & DCDC_LIMIT_RANGE_MASK)
+ >> DCDC_LIMIT_RANGE_SHIFT;
+
+ pmic->dcdc_range[id] = range;
+ return range;
}
static unsigned long tps65912_vsel_to_uv_range0(u8 vsel)
@@ -512,22 +494,10 @@ static int tps65912_list_voltage_dcdc(struct regulator_dev *dev,
struct tps65912_reg *pmic = rdev_get_drvdata(dev);
int range, voltage = 0, id = rdev_get_id(dev);
- switch (id) {
- case TPS65912_REG_DCDC1:
- range = pmic->dcdc1_range;
- break;
- case TPS65912_REG_DCDC2:
- range = pmic->dcdc2_range;
- break;
- case TPS65912_REG_DCDC3:
- range = pmic->dcdc3_range;
- break;
- case TPS65912_REG_DCDC4:
- range = pmic->dcdc4_range;
- break;
- default:
+ if (id > TPS65912_REG_DCDC4)
return -EINVAL;
- }
+
+ range = pmic->dcdc_range[id];
switch (range) {
case 0:
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists