* [PATCH 02/24] char: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 19:17 ` [PATCH 03/24] dma: " matt mooney
` (22 subsequent siblings)
23 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/char/mwave/Makefile | 4 ++--
drivers/char/mwave/README | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/char/mwave/Makefile b/drivers/char/mwave/Makefile
index 754c9e2..c0cf57e 100644
--- a/drivers/char/mwave/Makefile
+++ b/drivers/char/mwave/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_MWAVE) += mwave.o
mwave-objs := mwavedd.o smapi.o tp3780i.o 3780i.o
# To have the mwave driver disable other uarts if necessary
-# EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES
+# ccflags-y := -DMWAVE_FUTZ_WITH_OTHER_DEVICES
# To compile in lots (~20 KiB) of run-time enablable printk()s for debugging:
-EXTRA_CFLAGS += -DMW_TRACE
+ccflags-y += -DMW_TRACE
diff --git a/drivers/char/mwave/README b/drivers/char/mwave/README
index 480251f..c2a58f4 100644
--- a/drivers/char/mwave/README
+++ b/drivers/char/mwave/README
@@ -11,7 +11,7 @@ are not saved by the BIOS and so do not persist after unload and reload.
0x0008 tp3780i tracing
Tracing only occurs if the driver has been compiled with the
- MW_TRACE macro #defined (i.e. let EXTRA_CFLAGS += -DMW_TRACE
+ MW_TRACE macro #defined (i.e. let ccflags-y := -DMW_TRACE
in the Makefile).
mwave_3780i_irq=5/7/10/11/15
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 03/24] dma: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
2010-09-24 19:17 ` [PATCH 02/24] char: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 19:17 ` [PATCH 04/24] hwmon: " matt mooney
` (21 subsequent siblings)
23 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: Dan Williams, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/dma/Makefile | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 72bd703..69c5b1e 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -1,9 +1,5 @@
-ifeq ($(CONFIG_DMADEVICES_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
-ifeq ($(CONFIG_DMADEVICES_VDEBUG),y)
- EXTRA_CFLAGS += -DVERBOSE_DEBUG
-endif
+ccflags-$(CONFIG_DMADEVICES_DEBUG) := -DDEBUG
+ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG
obj-$(CONFIG_DMA_ENGINE) += dmaengine.o
obj-$(CONFIG_NET_DMA) += iovlock.o
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 04/24] hwmon: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
2010-09-24 19:17 ` [PATCH 02/24] char: " matt mooney
2010-09-24 19:17 ` [PATCH 03/24] dma: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 23:54 ` [lm-sensors] " Guenter Roeck
2010-09-27 15:04 ` Valdis.Kletnieks
2010-09-24 19:17 ` [PATCH 05/24] i2c: " matt mooney
` (20 subsequent siblings)
23 siblings, 2 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: lm-sensors, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/hwmon/Makefile | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index e3c2484..764b4db 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -109,7 +109,5 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o
-ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [lm-sensors] [PATCH 04/24] hwmon: change to new flag variable
2010-09-24 19:17 ` [PATCH 04/24] hwmon: " matt mooney
@ 2010-09-24 23:54 ` Guenter Roeck
2010-09-27 15:04 ` Valdis.Kletnieks
1 sibling, 0 replies; 46+ messages in thread
From: Guenter Roeck @ 2010-09-24 23:54 UTC (permalink / raw)
To: matt mooney
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
lm-sensors@lm-sensors.org
On Fri, Sep 24, 2010 at 03:17:14PM -0400, matt mooney wrote:
> Replace EXTRA_CFLAGS with ccflags-y.
>
> Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 04/24] hwmon: change to new flag variable
2010-09-24 19:17 ` [PATCH 04/24] hwmon: " matt mooney
2010-09-24 23:54 ` [lm-sensors] " Guenter Roeck
@ 2010-09-27 15:04 ` Valdis.Kletnieks
2010-09-27 17:23 ` matt mooney
1 sibling, 1 reply; 46+ messages in thread
From: Valdis.Kletnieks @ 2010-09-27 15:04 UTC (permalink / raw)
To: matt mooney; +Cc: kernel-janitors, lm-sensors, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 842 bytes --]
On Fri, 24 Sep 2010 12:17:14 PDT, matt mooney said:
> Replace EXTRA_CFLAGS with ccflags-y.
>
> Signed-off-by: matt mooney <mfm@muteddisk.com>
> ---
> drivers/hwmon/Makefile | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
> index e3c2484..764b4db 100644
> --- a/drivers/hwmon/Makefile
> +++ b/drivers/hwmon/Makefile
> @@ -109,7 +109,5 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
> obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
> obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o
>
> -ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)
> -EXTRA_CFLAGS += -DDEBUG
> -endif
> +ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG
Was this series intended as := rather than += as it seems that
overriding the entirely of a passed-in ccflags-y may not be what
we wanted to do.
[-- Attachment #2: Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 04/24] hwmon: change to new flag variable
2010-09-27 15:04 ` Valdis.Kletnieks
@ 2010-09-27 17:23 ` matt mooney
0 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-27 17:23 UTC (permalink / raw)
To: Valdis.Kletnieks; +Cc: kernel-janitors, lm-sensors, linux-kernel
On 11:04 Mon 27 Sep , Valdis.Kletnieks@vt.edu wrote:
> On Fri, 24 Sep 2010 12:17:14 PDT, matt mooney said:
> > Replace EXTRA_CFLAGS with ccflags-y.
> >
> > Signed-off-by: matt mooney <mfm@muteddisk.com>
> > ---
> > drivers/hwmon/Makefile | 4 +---
> > 1 files changed, 1 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
> > index e3c2484..764b4db 100644
> > --- a/drivers/hwmon/Makefile
> > +++ b/drivers/hwmon/Makefile
> > @@ -109,7 +109,5 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
> > obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
> > obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o
> >
> > -ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)
> > -EXTRA_CFLAGS += -DDEBUG
> > -endif
> > +ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG
>
> Was this series intended as := rather than += as it seems that
> overriding the entirely of a passed-in ccflags-y may not be what
> we wanted to do.
That is exactly why I changed += to :=. ccflags-y (and the older EXTRA_CFLAGS)
is a per directory variable that only has effect on the current directory, so
there is no passing in of ccflags-y.
-mfm
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 05/24] i2c: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (2 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 04/24] hwmon: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-25 11:26 ` Jean Delvare
2010-09-24 19:17 ` [PATCH 06/24] ide: " matt mooney
` (19 subsequent siblings)
23 siblings, 1 reply; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors
Cc: Jean Delvare (PC drivers, core), Ben Dooks (embedded platforms),
linux-i2c, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/i2c/Makefile | 4 +---
drivers/i2c/algos/Makefile | 4 +---
drivers/i2c/busses/Makefile | 4 +---
drivers/i2c/muxes/Makefile | 4 +---
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index c00fd66..23ac61e 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -9,6 +9,4 @@ obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o
obj-$(CONFIG_I2C_MUX) += i2c-mux.o
obj-y += algos/ busses/ muxes/
-ifeq ($(CONFIG_I2C_DEBUG_CORE),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_I2C_DEBUG_CORE) := -DDEBUG
diff --git a/drivers/i2c/algos/Makefile b/drivers/i2c/algos/Makefile
index 18b3e96..215303f 100644
--- a/drivers/i2c/algos/Makefile
+++ b/drivers/i2c/algos/Makefile
@@ -6,6 +6,4 @@ obj-$(CONFIG_I2C_ALGOBIT) += i2c-algo-bit.o
obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o
obj-$(CONFIG_I2C_ALGOPCA) += i2c-algo-pca.o
-ifeq ($(CONFIG_I2C_DEBUG_ALGO),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_I2C_DEBUG_ALGO) := -DDEBUG
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index c3ef492..033ad41 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -76,6 +76,4 @@ obj-$(CONFIG_I2C_STUB) += i2c-stub.o
obj-$(CONFIG_SCx200_ACB) += scx200_acb.o
obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o
-ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
index bd83b52..6f49786 100644
--- a/drivers/i2c/muxes/Makefile
+++ b/drivers/i2c/muxes/Makefile
@@ -3,6 +3,4 @@
obj-$(CONFIG_I2C_MUX_PCA954x) += pca954x.o
-ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 05/24] i2c: change to new flag variable
2010-09-24 19:17 ` [PATCH 05/24] i2c: " matt mooney
@ 2010-09-25 11:26 ` Jean Delvare
2010-09-26 2:12 ` matt mooney
0 siblings, 1 reply; 46+ messages in thread
From: Jean Delvare @ 2010-09-25 11:26 UTC (permalink / raw)
To: matt mooney
Cc: kernel-janitors, Ben Dooks (embedded platforms), linux-i2c,
linux-kernel
On Fri, 24 Sep 2010 12:17:15 -0700, matt mooney wrote:
> Replace EXTRA_CFLAGS with ccflags-y.
>
> Signed-off-by: matt mooney <mfm@muteddisk.com>
> ---
> drivers/i2c/Makefile | 4 +---
> drivers/i2c/algos/Makefile | 4 +---
> drivers/i2c/busses/Makefile | 4 +---
> drivers/i2c/muxes/Makefile | 4 +---
> 4 files changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
> index c00fd66..23ac61e 100644
> --- a/drivers/i2c/Makefile
> +++ b/drivers/i2c/Makefile
> @@ -9,6 +9,4 @@ obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o
> obj-$(CONFIG_I2C_MUX) += i2c-mux.o
> obj-y += algos/ busses/ muxes/
>
> -ifeq ($(CONFIG_I2C_DEBUG_CORE),y)
> -EXTRA_CFLAGS += -DDEBUG
> -endif
> +ccflags-$(CONFIG_I2C_DEBUG_CORE) := -DDEBUG
> diff --git a/drivers/i2c/algos/Makefile b/drivers/i2c/algos/Makefile
> index 18b3e96..215303f 100644
> --- a/drivers/i2c/algos/Makefile
> +++ b/drivers/i2c/algos/Makefile
> @@ -6,6 +6,4 @@ obj-$(CONFIG_I2C_ALGOBIT) += i2c-algo-bit.o
> obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o
> obj-$(CONFIG_I2C_ALGOPCA) += i2c-algo-pca.o
>
> -ifeq ($(CONFIG_I2C_DEBUG_ALGO),y)
> -EXTRA_CFLAGS += -DDEBUG
> -endif
> +ccflags-$(CONFIG_I2C_DEBUG_ALGO) := -DDEBUG
> diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
> index c3ef492..033ad41 100644
> --- a/drivers/i2c/busses/Makefile
> +++ b/drivers/i2c/busses/Makefile
> @@ -76,6 +76,4 @@ obj-$(CONFIG_I2C_STUB) += i2c-stub.o
> obj-$(CONFIG_SCx200_ACB) += scx200_acb.o
> obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o
>
> -ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
> -EXTRA_CFLAGS += -DDEBUG
> -endif
> +ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
> diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
> index bd83b52..6f49786 100644
> --- a/drivers/i2c/muxes/Makefile
> +++ b/drivers/i2c/muxes/Makefile
> @@ -3,6 +3,4 @@
>
> obj-$(CONFIG_I2C_MUX_PCA954x) += pca954x.o
>
> -ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
> -EXTRA_CFLAGS += -DDEBUG
> -endif
> +ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
If this is the way the whole kernel is going, I have no objection.
--
Jean Delvare
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 05/24] i2c: change to new flag variable
2010-09-25 11:26 ` Jean Delvare
@ 2010-09-26 2:12 ` matt mooney
2010-09-26 7:29 ` Jean Delvare
0 siblings, 1 reply; 46+ messages in thread
From: matt mooney @ 2010-09-26 2:12 UTC (permalink / raw)
To: Jean Delvare
Cc: kernel-janitors, Ben Dooks (embedded platforms), linux-i2c,
linux-kernel
On 13:26 Sat 25 Sep , Jean Delvare wrote:
> On Fri, 24 Sep 2010 12:17:15 -0700, matt mooney wrote:
> > Replace EXTRA_CFLAGS with ccflags-y.
> >
> > Signed-off-by: matt mooney <mfm@muteddisk.com>
> > ---
> > drivers/i2c/Makefile | 4 +---
> > drivers/i2c/algos/Makefile | 4 +---
> > drivers/i2c/busses/Makefile | 4 +---
> > drivers/i2c/muxes/Makefile | 4 +---
> > 4 files changed, 4 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
> > index c00fd66..23ac61e 100644
> > --- a/drivers/i2c/Makefile
> > +++ b/drivers/i2c/Makefile
> > @@ -9,6 +9,4 @@ obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o
> > obj-$(CONFIG_I2C_MUX) += i2c-mux.o
> > obj-y += algos/ busses/ muxes/
> >
> > -ifeq ($(CONFIG_I2C_DEBUG_CORE),y)
> > -EXTRA_CFLAGS += -DDEBUG
> > -endif
> > +ccflags-$(CONFIG_I2C_DEBUG_CORE) := -DDEBUG
> > diff --git a/drivers/i2c/algos/Makefile b/drivers/i2c/algos/Makefile
> > index 18b3e96..215303f 100644
> > --- a/drivers/i2c/algos/Makefile
> > +++ b/drivers/i2c/algos/Makefile
> > @@ -6,6 +6,4 @@ obj-$(CONFIG_I2C_ALGOBIT) += i2c-algo-bit.o
> > obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o
> > obj-$(CONFIG_I2C_ALGOPCA) += i2c-algo-pca.o
> >
> > -ifeq ($(CONFIG_I2C_DEBUG_ALGO),y)
> > -EXTRA_CFLAGS += -DDEBUG
> > -endif
> > +ccflags-$(CONFIG_I2C_DEBUG_ALGO) := -DDEBUG
> > diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
> > index c3ef492..033ad41 100644
> > --- a/drivers/i2c/busses/Makefile
> > +++ b/drivers/i2c/busses/Makefile
> > @@ -76,6 +76,4 @@ obj-$(CONFIG_I2C_STUB) += i2c-stub.o
> > obj-$(CONFIG_SCx200_ACB) += scx200_acb.o
> > obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o
> >
> > -ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
> > -EXTRA_CFLAGS += -DDEBUG
> > -endif
> > +ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
> > diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
> > index bd83b52..6f49786 100644
> > --- a/drivers/i2c/muxes/Makefile
> > +++ b/drivers/i2c/muxes/Makefile
> > @@ -3,6 +3,4 @@
> >
> > obj-$(CONFIG_I2C_MUX_PCA954x) += pca954x.o
> >
> > -ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
> > -EXTRA_CFLAGS += -DDEBUG
> > -endif
> > +ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
>
> If this is the way the whole kernel is going, I have no objection.
Sam had implemented these newer style flag variables a while back as an
eloquent way of handling conditional flags. A lot of newer (and some older)
modules and subsystems were using them already, so to provide uniformity and for
an eventual removal of the deprecated flags, I converted all remaining instances
to the newer style. (IMHO, I think it flows better with the way the rest of the
build system works.)
-mfm
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 05/24] i2c: change to new flag variable
2010-09-26 2:12 ` matt mooney
@ 2010-09-26 7:29 ` Jean Delvare
2010-09-26 18:07 ` matt mooney
0 siblings, 1 reply; 46+ messages in thread
From: Jean Delvare @ 2010-09-26 7:29 UTC (permalink / raw)
To: matt mooney
Cc: kernel-janitors, Ben Dooks (embedded platforms), linux-i2c,
linux-kernel
On Sat, 25 Sep 2010 19:12:17 -0700, matt mooney wrote:
> On 13:26 Sat 25 Sep , Jean Delvare wrote:
> > On Fri, 24 Sep 2010 12:17:15 -0700, matt mooney wrote:
> > > Replace EXTRA_CFLAGS with ccflags-y.
> > >
> > > Signed-off-by: matt mooney <mfm@muteddisk.com>
> > > ---
> > > drivers/i2c/Makefile | 4 +---
> > > drivers/i2c/algos/Makefile | 4 +---
> > > drivers/i2c/busses/Makefile | 4 +---
> > > drivers/i2c/muxes/Makefile | 4 +---
> > > 4 files changed, 4 insertions(+), 12 deletions(-)
> > >
> > > diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
> > > index c00fd66..23ac61e 100644
> > > --- a/drivers/i2c/Makefile
> > > +++ b/drivers/i2c/Makefile
> > > @@ -9,6 +9,4 @@ obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o
> > > obj-$(CONFIG_I2C_MUX) += i2c-mux.o
> > > obj-y += algos/ busses/ muxes/
> > >
> > > -ifeq ($(CONFIG_I2C_DEBUG_CORE),y)
> > > -EXTRA_CFLAGS += -DDEBUG
> > > -endif
> > > +ccflags-$(CONFIG_I2C_DEBUG_CORE) := -DDEBUG
> > > diff --git a/drivers/i2c/algos/Makefile b/drivers/i2c/algos/Makefile
> > > index 18b3e96..215303f 100644
> > > --- a/drivers/i2c/algos/Makefile
> > > +++ b/drivers/i2c/algos/Makefile
> > > @@ -6,6 +6,4 @@ obj-$(CONFIG_I2C_ALGOBIT) += i2c-algo-bit.o
> > > obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o
> > > obj-$(CONFIG_I2C_ALGOPCA) += i2c-algo-pca.o
> > >
> > > -ifeq ($(CONFIG_I2C_DEBUG_ALGO),y)
> > > -EXTRA_CFLAGS += -DDEBUG
> > > -endif
> > > +ccflags-$(CONFIG_I2C_DEBUG_ALGO) := -DDEBUG
> > > diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
> > > index c3ef492..033ad41 100644
> > > --- a/drivers/i2c/busses/Makefile
> > > +++ b/drivers/i2c/busses/Makefile
> > > @@ -76,6 +76,4 @@ obj-$(CONFIG_I2C_STUB) += i2c-stub.o
> > > obj-$(CONFIG_SCx200_ACB) += scx200_acb.o
> > > obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o
> > >
> > > -ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
> > > -EXTRA_CFLAGS += -DDEBUG
> > > -endif
> > > +ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
> > > diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
> > > index bd83b52..6f49786 100644
> > > --- a/drivers/i2c/muxes/Makefile
> > > +++ b/drivers/i2c/muxes/Makefile
> > > @@ -3,6 +3,4 @@
> > >
> > > obj-$(CONFIG_I2C_MUX_PCA954x) += pca954x.o
> > >
> > > -ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
> > > -EXTRA_CFLAGS += -DDEBUG
> > > -endif
> > > +ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
> >
> > If this is the way the whole kernel is going, I have no objection.
>
> Sam had implemented these newer style flag variables a while back as an
> eloquent way of handling conditional flags. A lot of newer (and some older)
> modules and subsystems were using them already, so to provide uniformity and for
> an eventual removal of the deprecated flags, I converted all remaining instances
> to the newer style. (IMHO, I think it flows better with the way the rest of the
> build system works.)
Fine with me. What's the planned merge path for this patch? Will you
push all the patches upstream yourself, or do you expect me to pick
this one?
--
Jean Delvare
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 05/24] i2c: change to new flag variable
2010-09-26 7:29 ` Jean Delvare
@ 2010-09-26 18:07 ` matt mooney
2010-09-29 13:56 ` Jean Delvare
0 siblings, 1 reply; 46+ messages in thread
From: matt mooney @ 2010-09-26 18:07 UTC (permalink / raw)
To: Jean Delvare
Cc: kernel-janitors, Ben Dooks (embedded platforms), linux-i2c,
linux-kernel, linux-kbuild
On 09:29 Sun 26 Sep , Jean Delvare wrote:
> On Sat, 25 Sep 2010 19:12:17 -0700, matt mooney wrote:
> > On 13:26 Sat 25 Sep , Jean Delvare wrote:
> > > On Fri, 24 Sep 2010 12:17:15 -0700, matt mooney wrote:
> > > > Replace EXTRA_CFLAGS with ccflags-y.
> > > >
> > > > Signed-off-by: matt mooney <mfm@muteddisk.com>
> > > > ---
> > > > drivers/i2c/Makefile | 4 +---
> > > > drivers/i2c/algos/Makefile | 4 +---
> > > > drivers/i2c/busses/Makefile | 4 +---
> > > > drivers/i2c/muxes/Makefile | 4 +---
> > > > 4 files changed, 4 insertions(+), 12 deletions(-)
> > > >
> > > > diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
> > > > index c00fd66..23ac61e 100644
> > > > --- a/drivers/i2c/Makefile
> > > > +++ b/drivers/i2c/Makefile
> > > > @@ -9,6 +9,4 @@ obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o
> > > > obj-$(CONFIG_I2C_MUX) += i2c-mux.o
> > > > obj-y += algos/ busses/ muxes/
> > > >
> > > > -ifeq ($(CONFIG_I2C_DEBUG_CORE),y)
> > > > -EXTRA_CFLAGS += -DDEBUG
> > > > -endif
> > > > +ccflags-$(CONFIG_I2C_DEBUG_CORE) := -DDEBUG
> > > > diff --git a/drivers/i2c/algos/Makefile b/drivers/i2c/algos/Makefile
> > > > index 18b3e96..215303f 100644
> > > > --- a/drivers/i2c/algos/Makefile
> > > > +++ b/drivers/i2c/algos/Makefile
> > > > @@ -6,6 +6,4 @@ obj-$(CONFIG_I2C_ALGOBIT) += i2c-algo-bit.o
> > > > obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o
> > > > obj-$(CONFIG_I2C_ALGOPCA) += i2c-algo-pca.o
> > > >
> > > > -ifeq ($(CONFIG_I2C_DEBUG_ALGO),y)
> > > > -EXTRA_CFLAGS += -DDEBUG
> > > > -endif
> > > > +ccflags-$(CONFIG_I2C_DEBUG_ALGO) := -DDEBUG
> > > > diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
> > > > index c3ef492..033ad41 100644
> > > > --- a/drivers/i2c/busses/Makefile
> > > > +++ b/drivers/i2c/busses/Makefile
> > > > @@ -76,6 +76,4 @@ obj-$(CONFIG_I2C_STUB) += i2c-stub.o
> > > > obj-$(CONFIG_SCx200_ACB) += scx200_acb.o
> > > > obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o
> > > >
> > > > -ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
> > > > -EXTRA_CFLAGS += -DDEBUG
> > > > -endif
> > > > +ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
> > > > diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
> > > > index bd83b52..6f49786 100644
> > > > --- a/drivers/i2c/muxes/Makefile
> > > > +++ b/drivers/i2c/muxes/Makefile
> > > > @@ -3,6 +3,4 @@
> > > >
> > > > obj-$(CONFIG_I2C_MUX_PCA954x) += pca954x.o
> > > >
> > > > -ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
> > > > -EXTRA_CFLAGS += -DDEBUG
> > > > -endif
> > > > +ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
> > >
> > > If this is the way the whole kernel is going, I have no objection.
> >
> > Sam had implemented these newer style flag variables a while back as an
> > eloquent way of handling conditional flags. A lot of newer (and some older)
> > modules and subsystems were using them already, so to provide uniformity and for
> > an eventual removal of the deprecated flags, I converted all remaining instances
> > to the newer style. (IMHO, I think it flows better with the way the rest of the
> > build system works.)
>
> Fine with me. What's the planned merge path for this patch? Will you
> push all the patches upstream yourself, or do you expect me to pick
> this one?
I was hoping subsystem maintainers would pick them up, but a lot of the patches
have been acked without being applied. My new plan is to have the unapplied ones
go through the kbuild tree. So you can either pick it up or just ack it.
Thanks,
mfm
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 05/24] i2c: change to new flag variable
2010-09-26 18:07 ` matt mooney
@ 2010-09-29 13:56 ` Jean Delvare
0 siblings, 0 replies; 46+ messages in thread
From: Jean Delvare @ 2010-09-29 13:56 UTC (permalink / raw)
To: matt mooney
Cc: kernel-janitors, Ben Dooks (embedded platforms), linux-i2c,
linux-kernel, linux-kbuild
On Sun, 26 Sep 2010 11:07:26 -0700, matt mooney wrote:
> On 09:29 Sun 26 Sep , Jean Delvare wrote:
> > On Sat, 25 Sep 2010 19:12:17 -0700, matt mooney wrote:
> > > Sam had implemented these newer style flag variables a while back as an
> > > eloquent way of handling conditional flags. A lot of newer (and some older)
> > > modules and subsystems were using them already, so to provide uniformity and for
> > > an eventual removal of the deprecated flags, I converted all remaining instances
> > > to the newer style. (IMHO, I think it flows better with the way the rest of the
> > > build system works.)
> >
> > Fine with me. What's the planned merge path for this patch? Will you
> > push all the patches upstream yourself, or do you expect me to pick
> > this one?
>
> I was hoping subsystem maintainers would pick them up, but a lot of the patches
> have been acked without being applied. My new plan is to have the unapplied ones
> go through the kbuild tree. So you can either pick it up or just ack it.
I've picked the patch, it's now in my i2c tree, scheduled for merge in 2.6.37.
--
Jean Delvare
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 06/24] ide: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (3 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 05/24] i2c: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 20:01 ` David Miller
2010-09-24 19:17 ` [PATCH 07/24] ieee802154: " matt mooney
` (18 subsequent siblings)
23 siblings, 1 reply; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: David S. Miller, linux-ide, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/ide/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 81df925..7f879b2 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -2,7 +2,7 @@
# link order is important here
#
-EXTRA_CFLAGS += -Idrivers/ide
+ccflags-y := -Idrivers/ide
ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \
ide-taskfile.o ide-pm.o ide-park.o ide-sysfs.o ide-devsets.o \
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 07/24] ieee802154: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (4 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 06/24] ide: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-26 10:31 ` Dmitry Eremin-Solenikov
2010-09-24 19:17 ` [PATCH 08/24] infiniband: " matt mooney
` (17 subsequent siblings)
23 siblings, 1 reply; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors
Cc: Dmitry Eremin-Solenikov, Sergey Lapin, linux-zigbee-devel,
linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/ieee802154/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/ieee802154/Makefile b/drivers/ieee802154/Makefile
index e0e8e1a..6899913 100644
--- a/drivers/ieee802154/Makefile
+++ b/drivers/ieee802154/Makefile
@@ -1,3 +1,3 @@
obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o
-EXTRA_CFLAGS += -DDEBUG -DCONFIG_FFD
+ccflags-y := -DDEBUG -DCONFIG_FFD
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 07/24] ieee802154: change to new flag variable
2010-09-24 19:17 ` [PATCH 07/24] ieee802154: " matt mooney
@ 2010-09-26 10:31 ` Dmitry Eremin-Solenikov
0 siblings, 0 replies; 46+ messages in thread
From: Dmitry Eremin-Solenikov @ 2010-09-26 10:31 UTC (permalink / raw)
To: matt mooney
Cc: kernel-janitors, Sergey Lapin, linux-zigbee-devel, linux-kernel
On 9/24/10, matt mooney <mfm@muteddisk.com> wrote:
> Replace EXTRA_CFLAGS with ccflags-y.
>
> Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
> drivers/ieee802154/Makefile | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 08/24] infiniband: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (5 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 07/24] ieee802154: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 19:17 ` [PATCH 09/24] input: " matt mooney
` (16 subsequent siblings)
23 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors
Cc: Tom Tucker, Steve Wise, Roland Dreier, Sean Hefty, Hal Rosenstock,
Ralph Campbell, linux-rdma, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/infiniband/hw/amso1100/Kbuild | 4 +---
drivers/infiniband/hw/cxgb3/Makefile | 6 ++----
drivers/infiniband/hw/cxgb4/Makefile | 2 +-
drivers/infiniband/hw/ipath/Makefile | 2 +-
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/infiniband/hw/amso1100/Kbuild b/drivers/infiniband/hw/amso1100/Kbuild
index 06964c4..950dfab 100644
--- a/drivers/infiniband/hw/amso1100/Kbuild
+++ b/drivers/infiniband/hw/amso1100/Kbuild
@@ -1,6 +1,4 @@
-ifdef CONFIG_INFINIBAND_AMSO1100_DEBUG
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_INFINIBAND_AMSO1100_DEBUG) := -DDEBUG
obj-$(CONFIG_INFINIBAND_AMSO1100) += iw_c2.o
diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile
index 7e7b5a6..621619c 100644
--- a/drivers/infiniband/hw/cxgb3/Makefile
+++ b/drivers/infiniband/hw/cxgb3/Makefile
@@ -1,10 +1,8 @@
-EXTRA_CFLAGS += -Idrivers/net/cxgb3
+ccflags-y := -Idrivers/net/cxgb3
obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o
iw_cxgb3-y := iwch_cm.o iwch_ev.o iwch_cq.o iwch_qp.o iwch_mem.o \
iwch_provider.o iwch.o cxio_hal.o cxio_resource.o
-ifdef CONFIG_INFINIBAND_CXGB3_DEBUG
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_INFINIBAND_CXGB3_DEBUG) += -DDEBUG
diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile
index e31a499..cd20b13 100644
--- a/drivers/infiniband/hw/cxgb4/Makefile
+++ b/drivers/infiniband/hw/cxgb4/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -Idrivers/net/cxgb4
+ccflags-y := -Idrivers/net/cxgb4
obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o
diff --git a/drivers/infiniband/hw/ipath/Makefile b/drivers/infiniband/hw/ipath/Makefile
index fa3df82..4496f28 100644
--- a/drivers/infiniband/hw/ipath/Makefile
+++ b/drivers/infiniband/hw/ipath/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -DIPATH_IDSTR='"QLogic kernel.org driver"' \
+ccflags-y := -DIPATH_IDSTR='"QLogic kernel.org driver"' \
-DIPATH_KERN_TYPE=0
obj-$(CONFIG_INFINIBAND_IPATH) += ib_ipath.o
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 09/24] input: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (6 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 08/24] infiniband: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 19:17 ` [PATCH 10/24] isdn: " matt mooney
` (15 subsequent siblings)
23 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: Dmitry Torokhov, linux-input, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/input/joystick/iforce/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/input/joystick/iforce/Makefile b/drivers/input/joystick/iforce/Makefile
index 74daff4..2648189 100644
--- a/drivers/input/joystick/iforce/Makefile
+++ b/drivers/input/joystick/iforce/Makefile
@@ -17,4 +17,4 @@ ifeq ($(CONFIG_JOYSTICK_IFORCE_USB),y)
iforce-objs += iforce-usb.o
endif
-EXTRA_CFLAGS = -Werror-implicit-function-declaration
+ccflags-y := -Werror-implicit-function-declaration
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 10/24] isdn: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (7 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 09/24] input: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 20:01 ` David Miller
2010-09-24 19:17 ` [PATCH 11/24] memstick: " matt mooney
` (14 subsequent siblings)
23 siblings, 1 reply; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: Karsten Keil, netdev, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/isdn/hisax/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile
index ab638b08..646368f 100644
--- a/drivers/isdn/hisax/Makefile
+++ b/drivers/isdn/hisax/Makefile
@@ -4,7 +4,7 @@
# Define maximum number of cards
-EXTRA_CFLAGS += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
+ccflags-y := -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o
obj-$(CONFIG_HISAX_SEDLBAUER_CS) += sedlbauer_cs.o
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 11/24] memstick: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (8 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 10/24] isdn: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 19:17 ` [PATCH 12/24] message: " matt mooney
` (13 subsequent siblings)
23 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: linux-kernel
The EXTRA_CFLAGS assignment in memstick/Makefile was not accomplishing
anything because this flag only has effect on sources at the same level
as the makefile (i.e., per directory). Since both core/ and host/ rely
on MEMSTICK_DEBUG, the subdir-ccflags-y variant seems to be the
appropriate choice.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/memstick/Makefile | 4 +---
drivers/memstick/core/Makefile | 4 ----
drivers/memstick/host/Makefile | 4 ----
3 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/drivers/memstick/Makefile b/drivers/memstick/Makefile
index dc160fb..9862359 100644
--- a/drivers/memstick/Makefile
+++ b/drivers/memstick/Makefile
@@ -2,9 +2,7 @@
# Makefile for the kernel MemoryStick device drivers.
#
-ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
+subdir-ccflags-$(CONFIG_MEMSTICK_DEBUG) := -DDEBUG
obj-$(CONFIG_MEMSTICK) += core/
obj-$(CONFIG_MEMSTICK) += host/
diff --git a/drivers/memstick/core/Makefile b/drivers/memstick/core/Makefile
index 8b2b529..ecd0299 100644
--- a/drivers/memstick/core/Makefile
+++ b/drivers/memstick/core/Makefile
@@ -2,10 +2,6 @@
# Makefile for the kernel MemoryStick core.
#
-ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
-
obj-$(CONFIG_MEMSTICK) += memstick.o
obj-$(CONFIG_MSPRO_BLOCK) += mspro_block.o
diff --git a/drivers/memstick/host/Makefile b/drivers/memstick/host/Makefile
index 12530e4..a1815e9 100644
--- a/drivers/memstick/host/Makefile
+++ b/drivers/memstick/host/Makefile
@@ -2,9 +2,5 @@
# Makefile for MemoryStick host controller drivers
#
-ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
-
obj-$(CONFIG_MEMSTICK_TIFM_MS) += tifm_ms.o
obj-$(CONFIG_MEMSTICK_JMICRON_38X) += jmb38x_ms.o
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 12/24] message: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (9 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 11/24] memstick: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 19:17 ` [PATCH 13/24] misc: " matt mooney
` (12 subsequent siblings)
23 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors
Cc: Eric Moore, support, DL-MPTFusionLinux, linux-scsi, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/message/fusion/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/message/fusion/Makefile b/drivers/message/fusion/Makefile
index 95c9532..d182a24 100644
--- a/drivers/message/fusion/Makefile
+++ b/drivers/message/fusion/Makefile
@@ -2,7 +2,7 @@
# enable verbose logging
# CONFIG_FUSION_LOGGING needs to be enabled in Kconfig
-#EXTRA_CFLAGS += -DMPT_DEBUG_VERBOSE
+#ccflags-y := -DMPT_DEBUG_VERBOSE
#=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 13/24] misc: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (10 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 12/24] message: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-28 13:02 ` Michał Mirosław
2010-09-24 19:17 ` [PATCH 14/24] mmc: " matt mooney
` (11 subsequent siblings)
23 siblings, 1 reply; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: Michał Mirosław, Jack Steiner, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/misc/cb710/Makefile | 4 +---
drivers/misc/sgi-gru/Makefile | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/misc/cb710/Makefile b/drivers/misc/cb710/Makefile
index 7b80cbf..467c8e9 100644
--- a/drivers/misc/cb710/Makefile
+++ b/drivers/misc/cb710/Makefile
@@ -1,6 +1,4 @@
-ifeq ($(CONFIG_CB710_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_CB710_DEBUG) := -DDEBUG
obj-$(CONFIG_CB710_CORE) += cb710.o
diff --git a/drivers/misc/sgi-gru/Makefile b/drivers/misc/sgi-gru/Makefile
index 7c4c306..0003a1d 100644
--- a/drivers/misc/sgi-gru/Makefile
+++ b/drivers/misc/sgi-gru/Makefile
@@ -1,6 +1,4 @@
-ifdef CONFIG_SGI_GRU_DEBUG
- EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_SGI_GRU_DEBUG) := -DDEBUG
obj-$(CONFIG_SGI_GRU) := gru.o
gru-y := grufile.o grumain.o grufault.o grutlbpurge.o gruprocfs.o grukservices.o gruhandles.o grukdump.o
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 13/24] misc: change to new flag variable
2010-09-24 19:17 ` [PATCH 13/24] misc: " matt mooney
@ 2010-09-28 13:02 ` Michał Mirosław
2010-09-29 22:55 ` matt mooney
0 siblings, 1 reply; 46+ messages in thread
From: Michał Mirosław @ 2010-09-28 13:02 UTC (permalink / raw)
To: matt mooney; +Cc: kernel-janitors, Jack Steiner, linux-kernel
On Fri, Sep 24, 2010 at 12:17:23PM -0700, matt mooney wrote:
> Replace EXTRA_CFLAGS with ccflags-y.
>
> Signed-off-by: matt mooney <mfm@muteddisk.com>
> ---
> drivers/misc/cb710/Makefile | 4 +---
> drivers/misc/sgi-gru/Makefile | 4 +---
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/misc/cb710/Makefile b/drivers/misc/cb710/Makefile
> index 7b80cbf..467c8e9 100644
> --- a/drivers/misc/cb710/Makefile
> +++ b/drivers/misc/cb710/Makefile
> @@ -1,6 +1,4 @@
> -ifeq ($(CONFIG_CB710_DEBUG),y)
> - EXTRA_CFLAGS += -DDEBUG
> -endif
> +ccflags-$(CONFIG_CB710_DEBUG) := -DDEBUG
>
> obj-$(CONFIG_CB710_CORE) += cb710.o
>
In case you need it:
Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 13/24] misc: change to new flag variable
2010-09-28 13:02 ` Michał Mirosław
@ 2010-09-29 22:55 ` matt mooney
0 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-29 22:55 UTC (permalink / raw)
To: Michał Mirosław; +Cc: kernel-janitors, Jack Steiner, linux-kernel
On 15:02 Tue 28 Sep , Michał Mirosław wrote:
> On Fri, Sep 24, 2010 at 12:17:23PM -0700, matt mooney wrote:
> > Replace EXTRA_CFLAGS with ccflags-y.
> >
> > Signed-off-by: matt mooney <mfm@muteddisk.com>
> > ---
> > drivers/misc/cb710/Makefile | 4 +---
> > drivers/misc/sgi-gru/Makefile | 4 +---
> > 2 files changed, 2 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/misc/cb710/Makefile b/drivers/misc/cb710/Makefile
> > index 7b80cbf..467c8e9 100644
> > --- a/drivers/misc/cb710/Makefile
> > +++ b/drivers/misc/cb710/Makefile
> > @@ -1,6 +1,4 @@
> > -ifeq ($(CONFIG_CB710_DEBUG),y)
> > - EXTRA_CFLAGS += -DDEBUG
> > -endif
> > +ccflags-$(CONFIG_CB710_DEBUG) := -DDEBUG
> >
> > obj-$(CONFIG_CB710_CORE) += cb710.o
> >
>
> In case you need it:
>
> Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Always helps!
Thanks,
mfm
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 14/24] mmc: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (11 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 13/24] misc: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 19:17 ` [PATCH 15/24] net: " matt mooney
` (10 subsequent siblings)
23 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: linux-mmc, linux-kernel
The EXTRA_CFLAGS assignment in mmc/Makefile was not accomplishing
anything because this flag only has effect on sources at the same level
as the makefile (i.e., per directory). Since card/, core/, and host/
rely on MMC_DEBUG, the subdir-ccflags-y variant seems to be the
appropriate choice.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/mmc/Makefile | 4 +---
drivers/mmc/card/Makefile | 4 ----
drivers/mmc/core/Makefile | 4 ----
drivers/mmc/host/Makefile | 4 ----
4 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 9979f5e..12eef39 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -2,9 +2,7 @@
# Makefile for the kernel mmc device drivers.
#
-ifeq ($(CONFIG_MMC_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
+subdir-ccflags-$(CONFIG_MMC_DEBUG) := -DDEBUG
obj-$(CONFIG_MMC) += core/
obj-$(CONFIG_MMC) += card/
diff --git a/drivers/mmc/card/Makefile b/drivers/mmc/card/Makefile
index 0d40751..c73b406 100644
--- a/drivers/mmc/card/Makefile
+++ b/drivers/mmc/card/Makefile
@@ -2,10 +2,6 @@
# Makefile for MMC/SD card drivers
#
-ifeq ($(CONFIG_MMC_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
-
obj-$(CONFIG_MMC_BLOCK) += mmc_block.o
mmc_block-objs := block.o queue.o
obj-$(CONFIG_MMC_TEST) += mmc_test.o
diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile
index 889e5f8..86b4791 100644
--- a/drivers/mmc/core/Makefile
+++ b/drivers/mmc/core/Makefile
@@ -2,10 +2,6 @@
# Makefile for the kernel mmc core.
#
-ifeq ($(CONFIG_MMC_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
-
obj-$(CONFIG_MMC) += mmc_core.o
mmc_core-y := core.o bus.o host.o \
mmc.o mmc_ops.o sd.o sd_ops.o \
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index 840bcb5..e35e778 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -2,10 +2,6 @@
# Makefile for MMC/SD host controller drivers
#
-ifeq ($(CONFIG_MMC_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
-
obj-$(CONFIG_MMC_ARMMMCI) += mmci.o
obj-$(CONFIG_MMC_PXA) += pxamci.o
obj-$(CONFIG_MMC_IMX) += imxmmc.o
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 15/24] net: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (12 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 14/24] mmc: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 19:25 ` John W. Linville
2010-09-24 20:01 ` David Miller
2010-09-24 19:17 ` [PATCH 16/24] pci: " matt mooney
` (9 subsequent siblings)
23 siblings, 2 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors
Cc: Sjur Braendeland, Jouni Malinen, John W. Linville, Daniel Drake,
Ulrich Kunitz, netdev, linux-kernel, linux-wireless
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/net/caif/Makefile | 4 +---
drivers/net/skfp/Makefile | 2 +-
drivers/net/wan/lmc/Makefile | 2 +-
drivers/net/wireless/hostap/hostap_config.h | 4 ++--
drivers/net/wireless/zd1211rw/Makefile | 4 +---
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/net/caif/Makefile b/drivers/net/caif/Makefile
index 3a11d61..b5dc44c 100644
--- a/drivers/net/caif/Makefile
+++ b/drivers/net/caif/Makefile
@@ -1,6 +1,4 @@
-ifeq ($(CONFIG_CAIF_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_CAIF_DEBUG) := -DDEBUG
# Serial interface
obj-$(CONFIG_CAIF_TTY) += caif_serial.o
diff --git a/drivers/net/skfp/Makefile b/drivers/net/skfp/Makefile
index cb23580..045d815 100644
--- a/drivers/net/skfp/Makefile
+++ b/drivers/net/skfp/Makefile
@@ -17,4 +17,4 @@ skfp-objs := skfddi.o hwmtm.o fplustm.o smt.o cfm.o \
# projects. To keep the source common for all those drivers (and
# thus simplify fixes to it), please do not clean it up!
-EXTRA_CFLAGS += -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
+ccflags-y := -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
diff --git a/drivers/net/wan/lmc/Makefile b/drivers/net/wan/lmc/Makefile
index dabdcfe..609710d 100644
--- a/drivers/net/wan/lmc/Makefile
+++ b/drivers/net/wan/lmc/Makefile
@@ -14,4 +14,4 @@ lmc-objs := lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o
# -DDEBUG \
# -DLMC_PACKET_LOG
-EXTRA_CFLAGS += -I. $(DBGDEF)
+ccflags-y := -I. $(DBGDEF)
diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/hostap/hostap_config.h
index 30acd39..2c8f71f 100644
--- a/drivers/net/wireless/hostap/hostap_config.h
+++ b/drivers/net/wireless/hostap/hostap_config.h
@@ -30,9 +30,9 @@
/* Following defines can be used to remove unneeded parts of the driver, e.g.,
* to limit the size of the kernel module. Definitions can be added here in
- * hostap_config.h or they can be added to make command with EXTRA_CFLAGS,
+ * hostap_config.h or they can be added to make command with ccflags-y,
* e.g.,
- * 'make pccard EXTRA_CFLAGS="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
+ * 'make pccard ccflags-y="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
*/
/* Do not include debug messages into the driver */
diff --git a/drivers/net/wireless/zd1211rw/Makefile b/drivers/net/wireless/zd1211rw/Makefile
index 1907eaf..5728a91 100644
--- a/drivers/net/wireless/zd1211rw/Makefile
+++ b/drivers/net/wireless/zd1211rw/Makefile
@@ -5,7 +5,5 @@ zd1211rw-objs := zd_chip.o zd_mac.o \
zd_rf_al7230b.o zd_rf_uw2453.o \
zd_rf.o zd_usb.o
-ifeq ($(CONFIG_ZD1211RW_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_ZD1211RW_DEBUG) := -DDEBUG
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 15/24] net: change to new flag variable
2010-09-24 19:17 ` [PATCH 15/24] net: " matt mooney
@ 2010-09-24 19:25 ` John W. Linville
2010-09-24 20:01 ` David Miller
1 sibling, 0 replies; 46+ messages in thread
From: John W. Linville @ 2010-09-24 19:25 UTC (permalink / raw)
To: matt mooney
Cc: kernel-janitors, Sjur Braendeland, Jouni Malinen, Daniel Drake,
Ulrich Kunitz, netdev, linux-kernel, linux-wireless
On Fri, Sep 24, 2010 at 12:17:25PM -0700, matt mooney wrote:
> Replace EXTRA_CFLAGS with ccflags-y.
>
> Signed-off-by: matt mooney <mfm@muteddisk.com>
> ---
> drivers/net/wireless/hostap/hostap_config.h | 4 ++--
> drivers/net/wireless/zd1211rw/Makefile | 4 +---
ACK for these bits...
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 15/24] net: change to new flag variable
2010-09-24 19:17 ` [PATCH 15/24] net: " matt mooney
2010-09-24 19:25 ` John W. Linville
@ 2010-09-24 20:01 ` David Miller
1 sibling, 0 replies; 46+ messages in thread
From: David Miller @ 2010-09-24 20:01 UTC (permalink / raw)
To: mfm
Cc: kernel-janitors, sjur.brandeland, j, linville, dsd, kune, netdev,
linux-kernel, linux-wireless
From: matt mooney <mfm@muteddisk.com>
Date: Fri, 24 Sep 2010 12:17:25 -0700
> Replace EXTRA_CFLAGS with ccflags-y.
>
> Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 16/24] pci: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (13 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 15/24] net: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-10-15 19:54 ` Jesse Barnes
2010-09-24 19:17 ` [PATCH 17/24] power: " matt mooney
` (8 subsequent siblings)
23 siblings, 1 reply; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: Jesse Barnes, linux-pci, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/pci/Makefile | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index dc1aa09..dcd7ace 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -65,6 +65,4 @@ obj-$(CONFIG_PCI_SYSCALL) += syscall.o
obj-$(CONFIG_PCI_STUB) += pci-stub.o
-ifeq ($(CONFIG_PCI_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 16/24] pci: change to new flag variable
2010-09-24 19:17 ` [PATCH 16/24] pci: " matt mooney
@ 2010-10-15 19:54 ` Jesse Barnes
0 siblings, 0 replies; 46+ messages in thread
From: Jesse Barnes @ 2010-10-15 19:54 UTC (permalink / raw)
To: matt mooney; +Cc: kernel-janitors, linux-pci, linux-kernel
On Fri, 24 Sep 2010 12:17:26 -0700
matt mooney <mfm@muteddisk.com> wrote:
> Replace EXTRA_CFLAGS with ccflags-y.
>
> Signed-off-by: matt mooney <mfm@muteddisk.com>
> ---
> drivers/pci/Makefile | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
> index dc1aa09..dcd7ace 100644
> --- a/drivers/pci/Makefile
> +++ b/drivers/pci/Makefile
> @@ -65,6 +65,4 @@ obj-$(CONFIG_PCI_SYSCALL) += syscall.o
>
> obj-$(CONFIG_PCI_STUB) += pci-stub.o
>
> -ifeq ($(CONFIG_PCI_DEBUG),y)
> -EXTRA_CFLAGS += -DDEBUG
> -endif
> +ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
Applied, thanks.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 17/24] power: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (14 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 16/24] pci: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 19:17 ` [PATCH 18/24] pps: " matt mooney
` (7 subsequent siblings)
23 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/power/Makefile | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 10143aa..a0cffe0 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -8,9 +8,7 @@ ifeq ($(CONFIG_LEDS_TRIGGERS),y)
power_supply-objs += power_supply_leds.o
endif
-ifeq ($(CONFIG_POWER_SUPPLY_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_POWER_SUPPLY_DEBUG) := -DDEBUG
obj-$(CONFIG_POWER_SUPPLY) += power_supply.o
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 18/24] pps: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (15 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 17/24] power: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 19:17 ` [PATCH 19/24] rapidio: " matt mooney
` (6 subsequent siblings)
23 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: Rodolfo Giometti, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/pps/clients/Makefile | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/pps/clients/Makefile b/drivers/pps/clients/Makefile
index 812c9b1..b52dbb8 100644
--- a/drivers/pps/clients/Makefile
+++ b/drivers/pps/clients/Makefile
@@ -5,6 +5,4 @@
obj-$(CONFIG_PPS_CLIENT_KTIMER) += pps-ktimer.o
obj-$(CONFIG_PPS_CLIENT_LDISC) += pps-ldisc.o
-ifeq ($(CONFIG_PPS_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_PPS_DEBUG) := -DDEBUG
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 19/24] rapidio: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (16 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 18/24] pps: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 19:17 ` [PATCH 20/24] rtc: " matt mooney
` (5 subsequent siblings)
23 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: Matt Porter, linux-kernel
switches/ depends on RAPIDIO_DEBUG so the subdir-ccflags-y variant
seems to be appropriate here.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/rapidio/Makefile | 4 +---
drivers/rapidio/switches/Makefile | 4 ----
2 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/drivers/rapidio/Makefile b/drivers/rapidio/Makefile
index b6139fe..89b8eca 100644
--- a/drivers/rapidio/Makefile
+++ b/drivers/rapidio/Makefile
@@ -5,6 +5,4 @@ obj-y += rio.o rio-access.o rio-driver.o rio-scan.o rio-sysfs.o
obj-$(CONFIG_RAPIDIO) += switches/
-ifeq ($(CONFIG_RAPIDIO_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+subdir-ccflags-$(CONFIG_RAPIDIO_DEBUG) := -DDEBUG
diff --git a/drivers/rapidio/switches/Makefile b/drivers/rapidio/switches/Makefile
index fe4adc3..0fece0e 100644
--- a/drivers/rapidio/switches/Makefile
+++ b/drivers/rapidio/switches/Makefile
@@ -6,7 +6,3 @@ obj-$(CONFIG_RAPIDIO_TSI57X) += tsi57x.o
obj-$(CONFIG_RAPIDIO_CPS_XX) += idtcps.o
obj-$(CONFIG_RAPIDIO_TSI568) += tsi568.o
obj-$(CONFIG_RAPIDIO_TSI500) += tsi500.o
-
-ifeq ($(CONFIG_RAPIDIO_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 20/24] rtc: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (17 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 19/24] rapidio: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-25 1:37 ` [rtc-linux] " Wan ZongShun
2010-09-24 19:17 ` [PATCH 21/24] scsi: " matt mooney
` (4 subsequent siblings)
23 siblings, 1 reply; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: Alessandro Zummo, rtc-linux, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/rtc/Makefile | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 0f207b3..f2d69d5 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -2,9 +2,7 @@
# Makefile for RTC class/drivers.
#
-ifeq ($(CONFIG_RTC_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_RTC_DEBUG) := -DDEBUG
obj-$(CONFIG_RTC_LIB) += rtc-lib.o
obj-$(CONFIG_RTC_HCTOSYS) += hctosys.o
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [rtc-linux] [PATCH 20/24] rtc: change to new flag variable
2010-09-24 19:17 ` [PATCH 20/24] rtc: " matt mooney
@ 2010-09-25 1:37 ` Wan ZongShun
0 siblings, 0 replies; 46+ messages in thread
From: Wan ZongShun @ 2010-09-25 1:37 UTC (permalink / raw)
To: rtc-linux, Andrew Morton; +Cc: kernel-janitors, Alessandro Zummo, linux-kernel
2010/9/25 matt mooney <mfm@muteddisk.com>:
> Replace EXTRA_CFLAGS with ccflags-y.
Good idea.
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
>
> Signed-off-by: matt mooney <mfm@muteddisk.com>
> ---
> drivers/rtc/Makefile | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
> index 0f207b3..f2d69d5 100644
> --- a/drivers/rtc/Makefile
> +++ b/drivers/rtc/Makefile
> @@ -2,9 +2,7 @@
> # Makefile for RTC class/drivers.
> #
>
> -ifeq ($(CONFIG_RTC_DEBUG),y)
> - EXTRA_CFLAGS += -DDEBUG
> -endif
> +ccflags-$(CONFIG_RTC_DEBUG) := -DDEBUG
>
> obj-$(CONFIG_RTC_LIB) += rtc-lib.o
> obj-$(CONFIG_RTC_HCTOSYS) += hctosys.o
> --
> 1.7.2.1
>
> --
> You received this message because you are subscribed to "rtc-linux".
> Membership options at http://groups.google.com/group/rtc-linux .
> Please read http://groups.google.com/group/rtc-linux/web/checklist
> before submitting a driver.
--
*linux-arm-kernel mailing list
mail addr:linux-arm-kernel@lists.infradead.org
you can subscribe by:
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
* linux-arm-NUC900 mailing list
mail addr:NUC900@googlegroups.com
main web: https://groups.google.com/group/NUC900
you can subscribe it by sending me mail:
mcuos.com@gmail.com
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 21/24] scsi: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (18 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 20/24] rtc: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 19:17 ` [PATCH 22/24] spi: " matt mooney
` (3 subsequent siblings)
23 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors
Cc: Adaptec OEM Raid Solutions, James E.J. Bottomley, James Smart,
linux-scsi, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/scsi/aacraid/Makefile | 2 +-
drivers/scsi/aic94xx/Makefile | 4 +---
drivers/scsi/cxgb3i/Kbuild | 2 +-
drivers/scsi/libsas/Makefile | 6 ++----
drivers/scsi/lpfc/Makefile | 6 ++----
drivers/scsi/mvsas/Makefile | 4 +---
drivers/scsi/pcmcia/Makefile | 2 +-
7 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/drivers/scsi/aacraid/Makefile b/drivers/scsi/aacraid/Makefile
index f1cca4e..92df4d6 100644
--- a/drivers/scsi/aacraid/Makefile
+++ b/drivers/scsi/aacraid/Makefile
@@ -5,4 +5,4 @@ obj-$(CONFIG_SCSI_AACRAID) := aacraid.o
aacraid-objs := linit.o aachba.o commctrl.o comminit.o commsup.o \
dpcsup.o rx.o sa.o rkt.o nark.o
-EXTRA_CFLAGS := -Idrivers/scsi
+ccflags-y := -Idrivers/scsi
diff --git a/drivers/scsi/aic94xx/Makefile b/drivers/scsi/aic94xx/Makefile
index e78ce0f..c0a15c7 100644
--- a/drivers/scsi/aic94xx/Makefile
+++ b/drivers/scsi/aic94xx/Makefile
@@ -22,9 +22,7 @@
# along with the aic94xx driver; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-ifeq ($(CONFIG_AIC94XX_DEBUG),y)
- EXTRA_CFLAGS += -DASD_DEBUG -DASD_ENTER_EXIT
-endif
+ccflags-$(CONFIG_AIC94XX_DEBUG) := -DASD_DEBUG -DASD_ENTER_EXIT
obj-$(CONFIG_SCSI_AIC94XX) += aic94xx.o
aic94xx-y += aic94xx_init.o \
diff --git a/drivers/scsi/cxgb3i/Kbuild b/drivers/scsi/cxgb3i/Kbuild
index 70d060b..914ce3a 100644
--- a/drivers/scsi/cxgb3i/Kbuild
+++ b/drivers/scsi/cxgb3i/Kbuild
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3
+ccflags-y := -I$(srctree)/drivers/net/cxgb3
cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o
obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o
diff --git a/drivers/scsi/libsas/Makefile b/drivers/scsi/libsas/Makefile
index 1ad1323..c62aa7b 100644
--- a/drivers/scsi/libsas/Makefile
+++ b/drivers/scsi/libsas/Makefile
@@ -21,9 +21,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-ifeq ($(CONFIG_SCSI_SAS_LIBSAS_DEBUG),y)
- EXTRA_CFLAGS += -DSAS_DEBUG
-endif
+ccflags-$(CONFIG_SCSI_SAS_LIBSAS_DEBUG) := -DSAS_DEBUG
obj-$(CONFIG_SCSI_SAS_LIBSAS) += libsas.o
libsas-y += sas_init.o \
@@ -36,4 +34,4 @@ libsas-y += sas_init.o \
sas_scsi_host.o \
sas_task.o
libsas-$(CONFIG_SCSI_SAS_ATA) += sas_ata.o
-libsas-$(CONFIG_SCSI_SAS_HOST_SMP) += sas_host_smp.o
\ No newline at end of file
+libsas-$(CONFIG_SCSI_SAS_HOST_SMP) += sas_host_smp.o
diff --git a/drivers/scsi/lpfc/Makefile b/drivers/scsi/lpfc/Makefile
index ad05d6e..14de249 100644
--- a/drivers/scsi/lpfc/Makefile
+++ b/drivers/scsi/lpfc/Makefile
@@ -19,10 +19,8 @@
# *******************************************************************/
######################################################################
-ifneq ($(GCOV),)
- EXTRA_CFLAGS += -fprofile-arcs -ftest-coverage
- EXTRA_CFLAGS += -O0
-endif
+ccflags-$(GCOV) := -fprofile-arcs -ftest-coverage
+ccflags-$(GCOV) += -O0
obj-$(CONFIG_SCSI_LPFC) := lpfc.o
diff --git a/drivers/scsi/mvsas/Makefile b/drivers/scsi/mvsas/Makefile
index 52ac426..ffbf759 100644
--- a/drivers/scsi/mvsas/Makefile
+++ b/drivers/scsi/mvsas/Makefile
@@ -21,9 +21,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-ifeq ($(CONFIG_SCSI_MVSAS_DEBUG),y)
- EXTRA_CFLAGS += -DMV_DEBUG
-endif
+ccflags-$(CONFIG_SCSI_MVSAS_DEBUG) := -DMV_DEBUG
obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
mvsas-y += mv_init.o \
diff --git a/drivers/scsi/pcmcia/Makefile b/drivers/scsi/pcmcia/Makefile
index eca3790..683bf14 100644
--- a/drivers/scsi/pcmcia/Makefile
+++ b/drivers/scsi/pcmcia/Makefile
@@ -1,5 +1,5 @@
-EXTRA_CFLAGS += -Idrivers/scsi
+ccflags-y := -Idrivers/scsi
# 16-bit client drivers
obj-$(CONFIG_PCMCIA_QLOGIC) += qlogic_cs.o
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 22/24] spi: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (19 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 21/24] scsi: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-10-08 18:33 ` Grant Likely
2010-09-24 19:17 ` [PATCH 23/24] usb: " matt mooney
` (2 subsequent siblings)
23 siblings, 1 reply; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors
Cc: David Brownell, Grant Likely, spi-devel-general, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/spi/Makefile | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index e9cbd18..66c0c47 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -2,9 +2,7 @@
# Makefile for kernel SPI drivers.
#
-ifeq ($(CONFIG_SPI_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_SPI_DEBUG) := -DDEBUG
# small core, mostly translating board-specific
# config declarations into driver model code
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 22/24] spi: change to new flag variable
2010-09-24 19:17 ` [PATCH 22/24] spi: " matt mooney
@ 2010-10-08 18:33 ` Grant Likely
0 siblings, 0 replies; 46+ messages in thread
From: Grant Likely @ 2010-10-08 18:33 UTC (permalink / raw)
To: matt mooney
Cc: kernel-janitors, David Brownell, spi-devel-general, linux-kernel
On Fri, Sep 24, 2010 at 12:17:32PM -0700, matt mooney wrote:
> Replace EXTRA_CFLAGS with ccflags-y.
>
> Signed-off-by: matt mooney <mfm@muteddisk.com>
Applied, thanks.
g.
> ---
> drivers/spi/Makefile | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
> index e9cbd18..66c0c47 100644
> --- a/drivers/spi/Makefile
> +++ b/drivers/spi/Makefile
> @@ -2,9 +2,7 @@
> # Makefile for kernel SPI drivers.
> #
>
> -ifeq ($(CONFIG_SPI_DEBUG),y)
> -EXTRA_CFLAGS += -DDEBUG
> -endif
> +ccflags-$(CONFIG_SPI_DEBUG) := -DDEBUG
>
> # small core, mostly translating board-specific
> # config declarations into driver model code
> --
> 1.7.2.1
>
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 23/24] usb: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (20 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 22/24] spi: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-24 20:02 ` [usb-storage] " Matthew Dharm
2010-09-24 19:17 ` [PATCH 24/24] video: " matt mooney
2010-09-25 2:52 ` [PATCH 01/24] base: " Américo Wang
23 siblings, 1 reply; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors
Cc: Greg Kroah-Hartman, David Brownell, Felipe Balbi, Matthew Dharm,
David Vrabel, linux-usb, linux-kernel, usb-storage
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/usb/atm/Makefile | 4 +---
drivers/usb/core/Makefile | 4 +---
drivers/usb/gadget/Makefile | 4 +---
drivers/usb/host/Makefile | 4 +---
drivers/usb/misc/Makefile | 4 +---
drivers/usb/musb/Makefile | 4 +---
drivers/usb/storage/Makefile | 2 +-
drivers/usb/wusbcore/Makefile | 4 +---
8 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/drivers/usb/atm/Makefile b/drivers/usb/atm/Makefile
index 4c4a776..d40a126 100644
--- a/drivers/usb/atm/Makefile
+++ b/drivers/usb/atm/Makefile
@@ -8,6 +8,4 @@ obj-$(CONFIG_USB_UEAGLEATM) += ueagle-atm.o
obj-$(CONFIG_USB_ATM) += usbatm.o
obj-$(CONFIG_USB_XUSBATM) += xusbatm.o
-ifeq ($(CONFIG_USB_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile
index ec16e60..17c8e2d 100644
--- a/drivers/usb/core/Makefile
+++ b/drivers/usb/core/Makefile
@@ -16,6 +16,4 @@ endif
obj-$(CONFIG_USB) += usbcore.o
-ifeq ($(CONFIG_USB_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 27283df..c682005 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -1,9 +1,7 @@
#
# USB peripheral controller drivers
#
-ifeq ($(CONFIG_USB_GADGET_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
obj-$(CONFIG_USB_DUMMY_HCD) += dummy_hcd.o
obj-$(CONFIG_USB_NET2280) += net2280.o
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index b6315aa..f041442 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -2,9 +2,7 @@
# Makefile for USB Host Controller Drivers
#
-ifeq ($(CONFIG_USB_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
isp1760-objs := isp1760-hcd.o isp1760-if.o
fhci-objs := fhci-hcd.o fhci-hub.o fhci-q.o fhci-mem.o \
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index 717703e..92d1ce0 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -25,6 +25,4 @@ obj-$(CONFIG_USB_SEVSEG) += usbsevseg.o
obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/
-ifeq ($(CONFIG_USB_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 9705f71..4fd29f8 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -74,6 +74,4 @@ endif
# Debugging
-ifeq ($(CONFIG_USB_MUSB_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_USB_MUSB_DEBUG) := -DDEBUG
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
index ef7e5a8..786f086 100644
--- a/drivers/usb/storage/Makefile
+++ b/drivers/usb/storage/Makefile
@@ -5,7 +5,7 @@
# Rewritten to use lists instead of if-statements.
#
-EXTRA_CFLAGS := -Idrivers/scsi
+ccflags-y := -Idrivers/scsi
obj-$(CONFIG_USB_STORAGE) += usb-storage.o
diff --git a/drivers/usb/wusbcore/Makefile b/drivers/usb/wusbcore/Makefile
index 75f1ade..f0d8045 100644
--- a/drivers/usb/wusbcore/Makefile
+++ b/drivers/usb/wusbcore/Makefile
@@ -21,6 +21,4 @@ wusb-wa-objs := wa-hc.o \
wa-rpipe.o \
wa-xfer.o
-ifeq ($(CONFIG_USB_WUSB_CBAF_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_USB_WUSB_CBAF_DEBUG) := -DDEBUG
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [usb-storage] [PATCH 23/24] usb: change to new flag variable
2010-09-24 19:17 ` [PATCH 23/24] usb: " matt mooney
@ 2010-09-24 20:02 ` Matthew Dharm
2010-09-24 20:28 ` matt mooney
0 siblings, 1 reply; 46+ messages in thread
From: Matthew Dharm @ 2010-09-24 20:02 UTC (permalink / raw)
To: matt mooney
Cc: kernel-janitors, David Brownell, usb-storage, Greg Kroah-Hartman,
linux-kernel, linux-usb, Felipe Balbi, David Vrabel
[-- Attachment #1: Type: text/plain, Size: 1007 bytes --]
On Fri, Sep 24, 2010 at 12:17:33PM -0700, matt mooney wrote:
> Replace EXTRA_CFLAGS with ccflags-y.
> diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
> index ef7e5a8..786f086 100644
> --- a/drivers/usb/storage/Makefile
> +++ b/drivers/usb/storage/Makefile
> @@ -5,7 +5,7 @@
> # Rewritten to use lists instead of if-statements.
> #
>
> -EXTRA_CFLAGS := -Idrivers/scsi
> +ccflags-y := -Idrivers/scsi
>
> obj-$(CONFIG_USB_STORAGE) += usb-storage.o
I don't really know anything about the new 'ccflags' stuff.. but my
instincts tell me that perhaps that should be
'ccflags-$(CONFIG_USB_STORAGE)' rather than 'ccflags-y'?
Does it make a difference that usb-storage can be built-in or a loadable
module?
Matt
--
Matthew Dharm Home: mdharm-usb@one-eyed-alien.net
Maintainer, Linux USB Mass Storage Driver
I could always suspend a few hundred accounts and watch what happens.
-- Tanya
User Friendly, 7/31/1998
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [usb-storage] [PATCH 23/24] usb: change to new flag variable
2010-09-24 20:02 ` [usb-storage] " Matthew Dharm
@ 2010-09-24 20:28 ` matt mooney
2010-09-24 23:21 ` matt mooney
0 siblings, 1 reply; 46+ messages in thread
From: matt mooney @ 2010-09-24 20:28 UTC (permalink / raw)
To: Matthew Dharm
Cc: kernel-janitors, David Brownell, usb-storage, Greg Kroah-Hartman,
linux-kernel, linux-usb, Felipe Balbi, David Vrabel, Michal Marek
On 13:02 Fri 24 Sep , Matthew Dharm wrote:
> On Fri, Sep 24, 2010 at 12:17:33PM -0700, matt mooney wrote:
> > Replace EXTRA_CFLAGS with ccflags-y.
>
> > diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
> > index ef7e5a8..786f086 100644
> > --- a/drivers/usb/storage/Makefile
> >
+++ b/drivers/usb/storage/Makefile
> > @@ -5,7 +5,7 @@
> > # Rewritten to use lists instead of if-statements.
> > #
> >
> > -EXTRA_CFLAGS := -Idrivers/scsi
> > +ccflags-y := -Idrivers/scsi
> >
> > obj-$(CONFIG_USB_STORAGE) += usb-storage.o
>
> I don't really know anything about the new 'ccflags' stuff.. but my
> instincts tell me that perhaps that should be
> 'ccflags-$(CONFIG_USB_STORAGE)' rather than 'ccflags-y'?
The flag has the same effect as EXTRA_CFLAGS in that it will be used to build
all sources at the same hierarchical level (i.e., per directory not including
subdirectories). I didn't want to change the semantics of the way the variable
was being used, but after looking at the Kconfig it seems that would be a
reasonable change. If only usb-storage needs the flag then it makes sense,
though it seems that everything else in the directory relies on usb-storage
anyway, but it gives it greater meaning knowing that only usb-storage relies on
the flag, IMHO.
>
> Does it make a difference that usb-storage can be built-in or a loadable
> module?
That would make a difference because ccflags-m is not used, so the change is not
possible.
-mfm
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [usb-storage] [PATCH 23/24] usb: change to new flag variable
2010-09-24 20:28 ` matt mooney
@ 2010-09-24 23:21 ` matt mooney
0 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 23:21 UTC (permalink / raw)
To: Matthew Dharm
Cc: kernel-janitors, David Brownell, usb-storage, Greg Kroah-Hartman,
linux-kernel, linux-usb, Felipe Balbi, David Vrabel, Michal Marek
On 13:28 Fri 24 Sep , matt mooney wrote:
> On 13:02 Fri 24 Sep , Matthew Dharm wrote:
> > On Fri, Sep 24, 2010 at 12:17:33PM -0700, matt mooney wrote:
> > > Replace EXTRA_CFLAGS with ccflags-y.
> >
> > > diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
> > > index ef7e5a8..786f086 100644
> > > --- a/drivers/usb/storage/Makefile
> > >
> +++ b/drivers/usb/storage/Makefile
> > > @@ -5,7 +5,7 @@
> > > # Rewritten to use lists instead of if-statements.
> > > #
> > >
> > > -EXTRA_CFLAGS := -Idrivers/scsi
> > > +ccflags-y := -Idrivers/scsi
> > >
> > > obj-$(CONFIG_USB_STORAGE) += usb-storage.o
> >
> > I don't really know anything about the new 'ccflags' stuff.. but my
> > instincts tell me that perhaps that should be
> > 'ccflags-$(CONFIG_USB_STORAGE)' rather than 'ccflags-y'?
>
> The flag has the same effect as EXTRA_CFLAGS in that it will be used to build
> all sources at the same hierarchical level (i.e., per directory not including
> subdirectories). I didn't want to change the semantics of the way the variable
> was being used, but after looking at the Kconfig it seems that would be a
> reasonable change. If only usb-storage needs the flag then it makes sense,
> though it seems that everything else in the directory relies on usb-storage
> anyway, but it gives it greater meaning knowing that only usb-storage relies on
> the flag, IMHO.
>
> >
> > Does it make a difference that usb-storage can be built-in or a loadable
> > module?
>
> That would make a difference because ccflags-m is not used, so the change is not
> possible.
I failed to mention earlier that there is a per file flag. If you really only
want usb-storage.o built with the flag, you can do:
CFLAGS_usb-storage.o := -Idrivers/scsi
-mfm
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 24/24] video: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (21 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 23/24] usb: " matt mooney
@ 2010-09-24 19:17 ` matt mooney
2010-09-25 2:52 ` [PATCH 01/24] base: " Américo Wang
23 siblings, 0 replies; 46+ messages in thread
From: matt mooney @ 2010-09-24 19:17 UTC (permalink / raw)
To: kernel-janitors; +Cc: Maik Broemme, linux-fbdev, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/video/intelfb/Makefile | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/drivers/video/intelfb/Makefile b/drivers/video/intelfb/Makefile
index 6c782d3..f7d631e 100644
--- a/drivers/video/intelfb/Makefile
+++ b/drivers/video/intelfb/Makefile
@@ -4,7 +4,4 @@ intelfb-y := intelfbdrv.o intelfbhw.o
intelfb-$(CONFIG_FB_INTEL_I2C) += intelfb_i2c.o
intelfb-objs := $(intelfb-y)
-ifdef CONFIG_FB_INTEL_DEBUG
-#EXTRA_CFLAGS += -DDEBUG -DVERBOSE -DREGDUMP
-EXTRA_CFLAGS += -DDEBUG -DREGDUMP
-endif
+ccflags-$(CONFIG_FB_INTEL_DEBUG) := -DDEBUG -DREGDUMP
--
1.7.2.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 01/24] base: change to new flag variable
2010-09-24 19:17 [PATCH 01/24] base: change to new flag variable matt mooney
` (22 preceding siblings ...)
2010-09-24 19:17 ` [PATCH 24/24] video: " matt mooney
@ 2010-09-25 2:52 ` Américo Wang
23 siblings, 0 replies; 46+ messages in thread
From: Américo Wang @ 2010-09-25 2:52 UTC (permalink / raw)
To: matt mooney
Cc: kernel-janitors, Greg Kroah-Hartman, linux-kernel, linux-kbuild,
Michal Marek
On Sat, Sep 25, 2010 at 3:17 AM, matt mooney <mfm@muteddisk.com> wrote:
> Replace EXTRA_CFLAGS with ccflags-y.
>
> Signed-off-by: matt mooney <mfm@muteddisk.com>
Nice work, matt!
The whole patch set looks good for me:
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Just please do remember to Cc linux-kbuild and Michal next time.
Thanks!
^ permalink raw reply [flat|nested] 46+ messages in thread