* [PATCH] tps65023-regulator: remove duplicate REG_CTRL2 defines
@ 2011-09-20 1:51 H Hartley Sweeten
2011-09-20 9:50 ` Mark Brown
2011-10-09 11:06 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: H Hartley Sweeten @ 2011-09-20 1:51 UTC (permalink / raw)
To: Linux Kernel; +Cc: lrg, broonie
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>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] tps65023-regulator: remove duplicate REG_CTRL2 defines
2011-09-20 1:51 [PATCH] tps65023-regulator: remove duplicate REG_CTRL2 defines H Hartley Sweeten
@ 2011-09-20 9:50 ` Mark Brown
2011-10-09 11:06 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-09-20 9:50 UTC (permalink / raw)
To: H Hartley Sweeten; +Cc: Linux Kernel, lrg
On Mon, Sep 19, 2011 at 06:51:39PM -0700, H Hartley Sweeten wrote:
> 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:
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] tps65023-regulator: remove duplicate REG_CTRL2 defines
2011-09-20 1:51 [PATCH] tps65023-regulator: remove duplicate REG_CTRL2 defines H Hartley Sweeten
2011-09-20 9:50 ` Mark Brown
@ 2011-10-09 11:06 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-10-09 11:06 UTC (permalink / raw)
To: H Hartley Sweeten; +Cc: Linux Kernel, lrg
On Mon, Sep 19, 2011 at 06:51:39PM -0700, H Hartley Sweeten wrote:
> 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-09 11:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-20 1:51 [PATCH] tps65023-regulator: remove duplicate REG_CTRL2 defines H Hartley Sweeten
2011-09-20 9:50 ` Mark Brown
2011-10-09 11:06 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).