summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-01-07 03:28:31 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-17 08:13:59 +0100
commit510799eaba39251b9362cf00a11ad866846e9cbf (patch)
tree8c96fb5ee728992b4d922c34d34f42dbe3c99e7e
parentregulator: lp8755: Don't show unrelated messags in lp8755_probe error paths (diff)
downloadlinux-510799eaba39251b9362cf00a11ad866846e9cbf.tar.xz
linux-510799eaba39251b9362cf00a11ad866846e9cbf.zip
regulator: lp8755: Remove enum bucks
We already have enum lp8755_bucks in lp8755.h, so it looks pointless adding enum bucks in lp8755.c. Signed-off-by: Axel Lin <axel.lin@ingics.com> Tested-by: Daniel Jeong <gshark.jeong@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/regulator/lp8755.c50
1 files changed, 17 insertions, 33 deletions
diff --git a/drivers/regulator/lp8755.c b/drivers/regulator/lp8755.c
index 8c3f3f2094c6..8b1ce0f174b1 100644
--- a/drivers/regulator/lp8755.c
+++ b/drivers/regulator/lp8755.c
@@ -37,15 +37,6 @@
#define LP8755_BUCK_LINEAR_OUT_MAX 0x76
#define LP8755_BUCK_VOUT_M 0x7F
-enum bucks {
- BUCK0 = 0,
- BUCK1,
- BUCK2,
- BUCK3,
- BUCK4,
- BUCK5,
-};
-
struct lp8755_mphase {
int nreg;
int buck_num[LP8755_BUCK_MAX];
@@ -262,33 +253,26 @@ static struct regulator_ops lp8755_buck_ops = {
}
static struct regulator_init_data lp8755_reg_default[LP8755_BUCK_MAX] = {
- [BUCK0] = lp8755_buck_init(0),
- [BUCK1] = lp8755_buck_init(1),
- [BUCK2] = lp8755_buck_init(2),
- [BUCK3] = lp8755_buck_init(3),
- [BUCK4] = lp8755_buck_init(4),
- [BUCK5] = lp8755_buck_init(5),
+ [LP8755_BUCK0] = lp8755_buck_init(0),
+ [LP8755_BUCK1] = lp8755_buck_init(1),
+ [LP8755_BUCK2] = lp8755_buck_init(2),
+ [LP8755_BUCK3] = lp8755_buck_init(3),
+ [LP8755_BUCK4] = lp8755_buck_init(4),
+ [LP8755_BUCK5] = lp8755_buck_init(5),
};
static const struct lp8755_mphase mphase_buck[MPHASE_CONF_MAX] = {
- {3, {BUCK0, BUCK3, BUCK5}
- },
- {6, {BUCK0, BUCK1, BUCK2, BUCK3, BUCK4, BUCK5}
- },
- {5, {BUCK0, BUCK2, BUCK3, BUCK4, BUCK5}
- },
- {4, {BUCK0, BUCK3, BUCK4, BUCK5}
- },
- {3, {BUCK0, BUCK4, BUCK5}
- },
- {2, {BUCK0, BUCK5}
- },
- {1, {BUCK0}
- },
- {2, {BUCK0, BUCK3}
- },
- {4, {BUCK0, BUCK2, BUCK3, BUCK5}
- },
+ { 3, { LP8755_BUCK0, LP8755_BUCK3, LP8755_BUCK5 } },
+ { 6, { LP8755_BUCK0, LP8755_BUCK1, LP8755_BUCK2, LP8755_BUCK3,
+ LP8755_BUCK4, LP8755_BUCK5 } },
+ { 5, { LP8755_BUCK0, LP8755_BUCK2, LP8755_BUCK3, LP8755_BUCK4,
+ LP8755_BUCK5} },
+ { 4, { LP8755_BUCK0, LP8755_BUCK3, LP8755_BUCK4, LP8755_BUCK5} },
+ { 3, { LP8755_BUCK0, LP8755_BUCK4, LP8755_BUCK5} },
+ { 2, { LP8755_BUCK0, LP8755_BUCK5} },
+ { 1, { LP8755_BUCK0} },
+ { 2, { LP8755_BUCK0, LP8755_BUCK3} },
+ { 4, { LP8755_BUCK0, LP8755_BUCK2, LP8755_BUCK3, LP8755_BUCK5} },
};
static int lp8755_init_data(struct lp8755_chip *pchip)