Skip to contentSkip to conversation

regulator: lp8755: Remove enum bucks

PATCH Applied Axel Lin 2 participants 2 messages Jan 7, 2013 – Jan 17, 2013 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/regulator/lp8755.c |   50 +++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 33 deletions(-)
drivers/regulator/lp8755.c +17 -33
index dbc4d12..29a1f81 100644
@@ -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)
Signature · 1 line
1.7.9.5
Applied
#1 lore raw
Quoted 2 lines · Axel Lin

We already have enum lp8755_bucks in lp8755.h, so it looks pointless adding enum bucks in lp8755.c.

Applied, thanks.