Skip to contentSkip to conversation

tps65023-regulator: remove duplicate REG_CTRL2 defines

PATCH Applied H Hartley Sweeten 2 participants 3 messages Sep 20, 2011 – Oct 9, 2011 Voltage and current regulator framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tps65023-regulator: remove duplicate REG_CTRL2 defines

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

---

drivers/regulator/tps65023-regulator.c +0 -7
index b02c670..9fb4c7b 100644
@@ -67,13 +67,6 @@
 #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)
 
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · H Hartley Sweeten

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:

Applied
#2 lore raw
In reply to H Hartley Sweeten
Quoted 3 lines · H Hartley Sweeten

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.

Applied, thanks.

Please do try to use subject lines that correspond to those for the rest of the subsystem, it makes applying the patches easier.