adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-30 20:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

HID: move away from DEBUG defines in favor of CONFIG_HID_DEBUG

Browse source 
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>
This commit is contained in:
Jiri Kosina 2007-01-30 16:02:24 +01:00
parent 43c7bf0472
commit dd64c151b9
4 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/hid/Makefile
View file

@ -1,19 +1,8 @@
# #
# Makefile for the HID driver # Makefile for the HID driver
# #
# Multipart objects.
hid-objs := hid-core.o hid-input.o 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
obj-$(CONFIG_HID) += hid.o obj-$(CONFIG_HID) += hid.o
hid-$(CONFIG_HID_DEBUG) += hid-debug.o

6
drivers/hid/hid-core.c
View file

@ -28,8 +28,6 @@
#include <linux/input.h> #include <linux/input.h>
#include <linux/wait.h> #include <linux/wait.h>
#undef DEBUG_DATA
#include <linux/hid.h> #include <linux/hid.h>
#include <linux/hiddev.h> #include <linux/hiddev.h>
#include <linux/hid-debug.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; return -1;
} }
#ifdef DEBUG_DATA #ifdef CONFIG_HID_DEBUG
printk(KERN_DEBUG __FILE__ ": report (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un"); printk(KERN_DEBUG __FILE__ ": report (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un");
#endif #endif
@ -961,7 +959,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
size--; size--;
} }
#ifdef DEBUG_DATA #ifdef CONFIG_HID_DEBUG
{ {
int i; int i;
printk(KERN_DEBUG __FILE__ ": report %d (size %u) = ", n, size); printk(KERN_DEBUG __FILE__ ": report %d (size %u) = ", n, size);

1
drivers/hid/hid-debug.c
View file

@ -28,7 +28,6 @@
* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
*/ */
//#include <linux/input.h>
#include <linux/hid.h> #include <linux/hid.h>
struct hid_usage_entry { struct hid_usage_entry {

6
drivers/hid/hid-input.c
View file

@ -31,8 +31,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#undef DEBUG
#include <linux/hid.h> #include <linux/hid.h>
#include <linux/hid-debug.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; field->hidinput = hidinput;
#ifdef DEBUG #ifdef CONFIG_HID_DEBUG
printk(KERN_DEBUG "Mapping: "); printk(KERN_DEBUG "Mapping: ");
hid_resolv_usage(usage->hid); hid_resolv_usage(usage->hid);
printk(" ---> "); printk(" ---> ");
@ -690,7 +688,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
return; return;
ignore: ignore:
#ifdef DEBUG #ifdef CONFIG_HID_DEBUG
printk("IGNORED\n"); printk("IGNORED\n");
#endif #endif
return; return;