regulator: Remove _en_reg, _en_bit and _ops parameters from tps65090_REG macro
authorAxel Lin <axel.lin@gmail.com>
Sat, 24 Mar 2012 02:57:53 +0000 (10:57 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 1 Apr 2012 10:59:32 +0000 (11:59 +0100)
Both _en_bit and _ops parameters for all DCDCs and FETs are the same, so we
can hardcode it in tps65090_REG macro.

_en_reg can be calculated by _id + 12, so we can also remove it.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked by: Venu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/tps65090-regulator.c

index 470ca7e366cfc4797cbaacfdb5961121df86ece8..7baff2e8765da9da25d4873c9f6fabcf03dfd327 100644 (file)
@@ -94,31 +94,31 @@ static struct regulator_ops tps65090_ops = {
        .is_enabled     = tps65090_reg_is_enabled,
 };
 
-#define tps65090_REG(_id, _en_reg, _en_bit, _ops)      \
+#define tps65090_REG(_id)                              \
 {                                                      \
-       .reg_en_reg     = _en_reg,                      \
-       .en_bit         = _en_bit,                      \
+       .reg_en_reg     = (TPS65090_ID_##_id) + 12,     \
+       .en_bit         = 0,                            \
        .id             = TPS65090_ID_##_id,            \
        .desc = {                                       \
                .name = tps65090_rails(_id),            \
                .id = TPS65090_ID_##_id,                \
-               .ops = &_ops,                           \
+               .ops = &tps65090_ops,                   \
                .type = REGULATOR_VOLTAGE,              \
                .owner = THIS_MODULE,                   \
        },                                              \
 }
 
 static struct tps65090_regulator TPS65090_regulator[] = {
-       tps65090_REG(DCDC1, 12, 0, tps65090_ops),
-       tps65090_REG(DCDC2, 13, 0, tps65090_ops),
-       tps65090_REG(DCDC3, 14, 0, tps65090_ops),
-       tps65090_REG(FET1,  15, 0, tps65090_ops),
-       tps65090_REG(FET2,  16, 0, tps65090_ops),
-       tps65090_REG(FET3,  17, 0, tps65090_ops),
-       tps65090_REG(FET4,  18, 0, tps65090_ops),
-       tps65090_REG(FET5,  19, 0, tps65090_ops),
-       tps65090_REG(FET6,  20, 0, tps65090_ops),
-       tps65090_REG(FET7,  21, 0, tps65090_ops),
+       tps65090_REG(DCDC1),
+       tps65090_REG(DCDC2),
+       tps65090_REG(DCDC3),
+       tps65090_REG(FET1),
+       tps65090_REG(FET2),
+       tps65090_REG(FET3),
+       tps65090_REG(FET4),
+       tps65090_REG(FET5),
+       tps65090_REG(FET6),
+       tps65090_REG(FET7),
 };
 
 static inline struct tps65090_regulator *find_regulator_info(int id)