2020-05-09 09:09:50

by Matej Dujava

Subject: [PATCH] staging: vt6656: vt6655: clean Makefiles

This patch is removing CFLAGS that are defining flags that are not used.

Signed-off-by: Matej Dujava <[email protected]>
---
drivers/staging/vt6655/Makefile | 27 ++++++++++++---------------
drivers/staging/vt6655/device_main.c | 1 -
drivers/staging/vt6656/Makefile | 7 ++-----
3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/vt6655/Makefile b/drivers/staging/vt6655/Makefile
index a151f30fc46f..eda08a1516ab 100644
--- a/drivers/staging/vt6655/Makefile
+++ b/drivers/staging/vt6655/Makefile
@@ -1,18 +1,15 @@
# SPDX-License-Identifier: GPL-2.0
-# TODO: all of these should be removed
-ccflags-y := -DLINUX -D__KERNEL__ -D__NO_VERSION__
-ccflags-y += -DHOSTAP
-
-vt6655_stage-y += device_main.o \
- card.o \
- channel.o \
- mac.o \
- baseband.o \
- rxtx.o \
- dpc.o \
- power.o \
- srom.o \
- key.o \
- rf.o

obj-$(CONFIG_VT6655) += vt6655_stage.o
+
+vt6655_stage-y += device_main.o \
+ card.o \
+ channel.o \
+ mac.o \
+ baseband.o \
+ rxtx.o \
+ dpc.o \
+ power.o \
+ srom.o \
+ key.o \
+ rf.o
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 5889023d19c4..41cbec4134b0 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -32,7 +32,6 @@
*
* Revision History:
*/
-#undef __NO_VERSION__

#include <linux/file.h>
#include "device.h"
diff --git a/drivers/staging/vt6656/Makefile b/drivers/staging/vt6656/Makefile
index a0f3862dea75..aac323d6a684 100644
--- a/drivers/staging/vt6656/Makefile
+++ b/drivers/staging/vt6656/Makefile
@@ -1,7 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
-# TODO: all of these should be removed
-ccflags-y := -DLINUX -D__KERNEL__ -DEXPORT_SYMTAB -D__NO_VERSION__
-ccflags-y += -DHOSTAP
+
+obj-$(CONFIG_VT6656) += vt6656_stage.o

vt6656_stage-y += main_usb.o \
card.o \
@@ -14,5 +13,3 @@ vt6656_stage-y += main_usb.o \
rf.o \
usbpipe.o \
channel.o
-
-obj-$(CONFIG_VT6656) += vt6656_stage.o
--
2.26.2

2020-05-09 17:09:45

by Greg Kroah-Hartman

Subject: Re: [PATCH] staging: vt6656: vt6655: clean Makefiles

On Sat, May 09, 2020 at 11:07:27AM +0200, Matej Dujava wrote:
> This patch is removing CFLAGS that are defining flags that are not used.

You are also modifying the indentation and moving lines around for no
reason :(

Please only do one thing for a patch, and always describe everything you
do in the changelog text.

Can you fix this up and send a v2?

thanks,

greg k-h

2020-05-09 19:32:22

by Matej Dujava

Subject: Re: [PATCH] staging: vt6656: vt6655: clean Makefiles

On Sat, May 09, 2020 at 07:07:14PM +0200, Greg Kroah-Hartman wrote:
>On Sat, May 09, 2020 at 11:07:27AM +0200, Matej Dujava wrote:
>> This patch is removing CFLAGS that are defining flags that are not used.
>
>You are also modifying the indentation and moving lines around for no
>reason :(
>
>Please only do one thing for a patch, and always describe everything you
>do in the changelog text.

sorry, I will split it into two separate patches and resend as v2

Thanks,
Matej

>
>Can you fix this up and send a v2?
>
>thanks,
>
>greg k-h