regulator: remove duplicate REG_CTRL2 defines in tps65023

There are two sets of defines for the REG_CTRL2 bitfields and one
of them has TPS65023_REG_CTRL2_DCDC1 defined incorrectly. Remove
the duplicates and leave the correct one for TPS65023_REG_CTRL2_DCDC1.

This fixes the following sparse warnings:

drivers/regulator/tps65023-regulator.c:77:9: warning: preprocessor token TPS65023_REG_CTRL2_DCDC1 redefined
drivers/regulator/tps65023-regulator.c:70:9: this was the original definition

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
index b02c670863532b6ff107d2b8f52c12164081eeea..9fb4c7b81753d99ff8effaa781f2d8b5930261d8 100644 (file)
--- a/drivers/regulator/tps65023-regulator.c
+++ b/drivers/regulator/tps65023-regulator.c
@@ -63,13 +63,6 @@
 #define TPS65023_REG_CTRL_LDO2_EN      BIT(2)
 #define TPS65023_REG_CTRL_LDO1_EN      BIT(1)
 
-/* REG_CTRL2 bitfields */
-#define TPS65023_REG_CTRL2_GO          BIT(7)
-#define TPS65023_REG_CTRL2_CORE_ADJ    BIT(6)
-#define TPS65023_REG_CTRL2_DCDC2       BIT(2)
-#define TPS65023_REG_CTRL2_DCDC1       BIT(2)
-#define TPS65023_REG_CTRL2_DCDC3       BIT(0)
-
 /* REG_CTRL2 bitfields */
 #define TPS65023_REG_CTRL2_GO          BIT(7)
 #define TPS65023_REG_CTRL2_CORE_ADJ    BIT(6)