caif: Kconfig and Makefile fixes

Use "depends on" instead of "if" in Kconfig files.
Fixed CAIF debug flag, and removed unnecessary clean-* options.

Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig
index 0b28e0107697e58349d66695f6c5e24fbcc53497..6f33ee453f41d4b8e9e87562bc01781d5bb2e79d 100644 (file)
--- a/drivers/net/caif/Kconfig
+++ b/drivers/net/caif/Kconfig
@@ -2,16 +2,13 @@
 # CAIF physical drivers
 #
 
-if CAIF
-
 comment "CAIF transport drivers"
 
 config CAIF_TTY
        tristate "CAIF TTY transport driver"
+       depends on CAIF
        default n
        ---help---
        The CAIF TTY transport driver is a Line Discipline (ldisc)
        identified as N_CAIF. When this ldisc is opened from user space
        it will redirect the TTY's traffic into the CAIF stack.
-
-endif # CAIF

diff --git a/drivers/net/caif/Makefile b/drivers/net/caif/Makefile
index 52b6d1f826f893e3d0a3b0582bad15b6ff26b23c..e6d3ca06ecfef73e059ed622c31be3a22718e80e 100644 (file)
--- a/drivers/net/caif/Makefile
+++ b/drivers/net/caif/Makefile
@@ -1,12 +1,6 @@
-ifeq ($(CONFIG_CAIF_DEBUG),1)
-CAIF_DBG_FLAGS := -DDEBUG
+ifeq ($(CONFIG_CAIF_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
 endif
 
-KBUILD_EXTRA_SYMBOLS=net/caif/Module.symvers
-
-ccflags-y := $(CAIF_FLAGS) $(CAIF_DBG_FLAGS)
-clean-dirs:= .tmp_versions
-clean-files:= Module.symvers modules.order *.cmd *~ \
-
 # Serial interface
 obj-$(CONFIG_CAIF_TTY) += caif_serial.o

diff --git a/net/caif/Kconfig b/net/caif/Kconfig
index ed651786f16b5ab231ab74c3be054cfeab7183ff..529750da962442a54491a9a88070cb2b136af590 100644 (file)
--- a/net/caif/Kconfig
+++ b/net/caif/Kconfig
@@ -21,19 +21,18 @@ menuconfig CAIF
        See Documentation/networking/caif for a further explanation on how to
        use and configure CAIF.
 
-if CAIF
-
 config  CAIF_DEBUG
        bool "Enable Debug"
+       depends on CAIF
        default n
        --- help ---
        Enable the inclusion of debug code in the CAIF stack.
        Be aware that doing this will impact performance.
        If unsure say N.
 
-
 config CAIF_NETDEV
        tristate "CAIF GPRS Network device"
+       depends on CAIF
        default CAIF
        ---help---
        Say Y if you will be using a CAIF based GPRS network device.
@@ -41,5 +40,3 @@ config CAIF_NETDEV
        If you select to build it as a built-in then the main CAIF device must
        also be a built-in.
        If unsure say Y.
-
-endif

diff --git a/net/caif/Makefile b/net/caif/Makefile
index 34852af2595e24befcfdf78e2e6ec674874bbd37..f87481fb0e65e01ec278351ea489342bd83a7f3e 100644 (file)
--- a/net/caif/Makefile
+++ b/net/caif/Makefile
@@ -1,23 +1,13 @@
-ifeq ($(CONFIG_CAIF_DEBUG),1)
-CAIF_DBG_FLAGS := -DDEBUG
+ifeq ($(CONFIG_CAIF_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
 endif
 
-ccflags-y := $(CAIF_FLAGS) $(CAIF_DBG_FLAGS)
-
 caif-objs := caif_dev.o \
        cfcnfg.o cfmuxl.o cfctrl.o  \
        cffrml.o cfveil.o cfdbgl.o\
        cfserl.o cfdgml.o  \
        cfrfml.o cfvidl.o cfutill.o \
        cfsrvl.o cfpkt_skbuff.o caif_config_util.o
-clean-dirs:= .tmp_versions
-
-clean-files:= \
-       Module.symvers \
-       modules.order \
-       *.cmd \
-       *.o \
-       *~
 
 obj-$(CONFIG_CAIF) += caif.o
 obj-$(CONFIG_CAIF_NETDEV) += chnl_net.o