aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-input.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2007-01-25 11:43:31 +0100
committerJiri Kosina <jkosina@suse.cz>2007-02-05 10:00:38 +0100
commitc080d89ad91e98fec0e8fc5f448a1ad899bd85c7 (patch)
tree169a03a0e8d16fe95e7d689dd9fa7775340d5dc4 /drivers/hid/hid-input.c
parenthid: force feedback driver for PantherLord USB/PS2 2in1 Adapter (diff)
downloadlinux-dev-c080d89ad91e98fec0e8fc5f448a1ad899bd85c7.tar.xz
linux-dev-c080d89ad91e98fec0e8fc5f448a1ad899bd85c7.zip
HID: hid debug from hid-debug.h to hid layer
hid-debug.h contains a lot of code, and should not therefore be a header. This patch moves the code to generic hid layer as .c source, and introduces CONFIG_HID_DEBUG to conditionally compile it, instead of playing with #define DEBUG and including hid-debug.h. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-input.c')
-rw-r--r--drivers/hid/hid-input.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 33b1126f5e5d..ae298c4bfcbd 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -34,6 +34,7 @@
#undef DEBUG
#include <linux/hid.h>
+#include <linux/hid-debug.h>
static int hid_pb_fnmode = 1;
module_param_named(pb_fnmode, hid_pb_fnmode, int, 0644);
@@ -254,7 +255,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
#ifdef DEBUG
printk(KERN_DEBUG "Mapping: ");
- resolv_usage(usage->hid);
+ hid_resolv_usage(usage->hid);
printk(" ---> ");
#endif
@@ -682,8 +683,8 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
field->dpad = usage->code;
}
-#ifdef DEBUG
- resolv_event(usage->type, usage->code);
+ hid_resolv_event(usage->type, usage->code);
+#ifdef CONFIG_HID_DEBUG
printk("\n");
#endif
return;