[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <201109191851.40743.hartleys@visionengravers.com>
Date: Mon, 19 Sep 2011 18:51:39 -0700
From: H Hartley Sweeten <hartleys@...ionengravers.com>
To: Linux Kernel <linux-kernel@...r.kernel.org>
CC: <lrg@...com>, <broonie@...nsource.wolfsonmicro.com>
Subject: [PATCH] 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
Signed-off-by: H Hartley Sweeten <hsweeten@...ionengravers.com>
Cc: Liam Girdwood <lrg@...com>
Cc: Mark Brown <broonie@...nsource.wolfsonmicro.com>
---
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
index b02c670..9fb4c7b 100644
--- a/drivers/regulator/tps65023-regulator.c
+++ b/drivers/regulator/tps65023-regulator.c
@@ -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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists