Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 46235
b: refs/heads/master
c: dd64c15
h: refs/heads/master
i:
  46233: 6f708ee
  46231: 49650a2
v: v3
  • Loading branch information
Jiri Kosina committed Feb 5, 2007
1 parent 0004697 commit 8460c49
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 23 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 43c7bf0472ec1f813fccc6012654399345898491
refs/heads/master: dd64c151b978dc78ed535433d930c75b5c15deeb
15 changes: 2 additions & 13 deletions trunk/drivers/hid/Makefile
Original file line number Diff line number Diff line change
@@ -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

6 changes: 2 additions & 4 deletions trunk/drivers/hid/hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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

Expand All @@ -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);
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/hid/hid-debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 2 additions & 4 deletions trunk/drivers/hid/hid-input.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
#include <linux/slab.h>
#include <linux/kernel.h>

#undef DEBUG

#include <linux/hid.h>
#include <linux/hid-debug.h>

Expand Down Expand Up @@ -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(" ---> ");
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8460c49

Please sign in to comment.