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>

diff --git a/drivers/staging/dgap/Makefile b/drivers/staging/dgap/Makefile
index 9f1fce157c77180260b758f0a1057d7959fd1dcb..3abe8d2bb748b3794c2c15430fb7a81b9b8464ab 100644 (file)
--- a/drivers/staging/dgap/Makefile
+++ b/drivers/staging/dgap/Makefile
@@ -1,5 +1,3 @@
-EXTRA_CFLAGS += -DDG_NAME=\"dgap-1.3-16\" -DDG_PART=\"40002347_C\"
-
 obj-$(CONFIG_DGAP) += dgap.o
 
 

diff --git a/drivers/staging/dgap/dgap_driver.h b/drivers/staging/dgap/dgap_driver.h
index 4b9538598f3c42f99a84e3c9a799a46bb3652088..7d631e80c00e8856dda9136cf14117250f4fc81d 100644 (file)
--- a/drivers/staging/dgap/dgap_driver.h
+++ b/drivers/staging/dgap/dgap_driver.h
@@ -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