OSDN Git Service

regulator: remove duplicate REG_CTRL2 defines in tps65023
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 20 Sep 2011 01:51:39 +0000 (18:51 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Oct 2011 11:05:27 +0000 (12:05 +0100)
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>
drivers/regulator/tps65023-regulator.c

index b02c670..9fb4c7b 100644 (file)
 #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)
-#define TPS65023_REG_CTRL2_DCDC2       BIT(2)
 #define TPS65023_REG_CTRL2_DCDC1       BIT(1)
 #define TPS65023_REG_CTRL2_DCDC3       BIT(0)