Commit 6319c61a authored Sep 21, 2013 by Chen Gang Committed by Greg Kroah-Hartman Sep 25, 2013

drivers: staging: dgap: move DG_NAME and DG_PART from "Makefile" to "dgap_driver.h"



Normally, the macros from command line are system specific macros (e.g
__linux, __KERNEL__ ...), and module own macros are usually defined in
their header files.

DG_NAME and DG_PART are driver 'dgap' owned macros which are used by
multiple files within driver, and need be defined in the driver main
header file.

So move DG_NAME and DG_PART to "dgap_driver.h", it not only can make
code clearer, but also can avoid compiling failure when EXTRA_CFLAGS
appended to make command line (e.g. "EXTRA_CFLAGS=-W").

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b74c7461

drivers/staging/dgap/Makefile

+0 −2

Original line number	Diff line number	Diff line
		EXTRA_CFLAGS += -DDG_NAME=\"dgap-1.3-16\" -DDG_PART=\"40002347_C\"

		obj-$(CONFIG_DGAP) += dgap.o

drivers/staging/dgap/dgap_driver.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,9 @@
		* DPR((fmt, args, ...)); Only prints if DGAP_TRACER is defined at
		* compile time and dgap_debug!=0
		*/
		#define DG_NAME "dgap-1.3-16"
		#define DG_PART "40002347_C"

		#define PROCSTR "dgap" /* /proc entries */
		#define DEVSTR "/dev/dg/dgap" /* /dev entries */
		#define DRVSTR "dgap" /* Driver name string