diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2007-01-30 16:02:24 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2007-02-05 10:00:45 +0100 |
| commit | dd64c151b978dc78ed535433d930c75b5c15deeb (patch) | |
| tree | 4acccad91bee0a5bcab5d7d87cdc35cfbea9ec2a /drivers | |
| parent | 43c7bf0472ec1f813fccc6012654399345898491 (diff) | |
| download | blackbird-op-linux-dd64c151b978dc78ed535433d930c75b5c15deeb.tar.gz blackbird-op-linux-dd64c151b978dc78ed535433d930c75b5c15deeb.zip | |
HID: move away from DEBUG defines in favor of CONFIG_HID_DEBUG
CONFIG_INPUT_DEBUG is non-existent option, so remove anything depending
on it.
Also, as we have new CONFIG_HID_DEBUG, this should be used on places
where ifdef DEBUG was used before.
Suggested by Adrian Bunk.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/Makefile | 15 | ||||
| -rw-r--r-- | drivers/hid/hid-core.c | 6 | ||||
| -rw-r--r-- | drivers/hid/hid-debug.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-input.c | 6 |
4 files changed, 6 insertions, 22 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 84c823eb5ad5..52e97d8f3c95 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -1,19 +1,8 @@ # # Makefile for the HID driver # - -# Multipart objects. -hid-objs := hid-core.o hid-input.o - -# Optional parts of multipart objects. -ifeq ($(CONFIG_HID_DEBUG),y) -hid-objs += hid-debug.o -endif - -ifeq ($(CONFIG_INPUT_DEBUG),y) -EXTRA_CFLAGS += -DDEBUG -endif - +hid-objs := hid-core.o hid-input.o obj-$(CONFIG_HID) += hid.o +hid-$(CONFIG_HID_DEBUG) += hid-debug.o diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 0796f64b3c54..8c7d48eff7b7 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -28,8 +28,6 @@ #include <linux/input.h> #include <linux/wait.h> -#undef DEBUG_DATA - #include <linux/hid.h> #include <linux/hiddev.h> #include <linux/hid-debug.h> @@ -951,7 +949,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i return -1; } -#ifdef DEBUG_DATA +#ifdef CONFIG_HID_DEBUG printk(KERN_DEBUG __FILE__ ": report (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un"); #endif @@ -961,7 +959,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i size--; } -#ifdef DEBUG_DATA +#ifdef CONFIG_HID_DEBUG { int i; printk(KERN_DEBUG __FILE__ ": report %d (size %u) = ", n, size); diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index d6abe3494c04..89241be4ec9b 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c @@ -28,7 +28,6 @@ * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic */ -//#include <linux/input.h> #include <linux/hid.h> struct hid_usage_entry { diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 4824b19b8646..25d180a24fc4 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -31,8 +31,6 @@ #include <linux/slab.h> #include <linux/kernel.h> -#undef DEBUG - #include <linux/hid.h> #include <linux/hid-debug.h> @@ -253,7 +251,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel field->hidinput = hidinput; -#ifdef DEBUG +#ifdef CONFIG_HID_DEBUG printk(KERN_DEBUG "Mapping: "); hid_resolv_usage(usage->hid); printk(" ---> "); @@ -690,7 +688,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel return; ignore: -#ifdef DEBUG +#ifdef CONFIG_HID_DEBUG printk("IGNORED\n"); #endif return; |
