[RFC: -mm patch] CONFIG_INPUT_DEBUG improvements

Adrian Bunk
2007-01-30T01:12:16Z

On Sat, Jan 27, 2007 at 11:49:28PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc4-mm1:
>...
> git-hid.patch
>...
> git trees.
>...

This patch contains the following CONFIG_INPUT_DEBUG improvements:
- remove Makefile code for the nonexisting CONFIG_INPUT_DEBUG
- simpler Makefile for hid-debug.o
- replace all HID debug #define's with CONFIG_INPUT_DEBUG

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

drivers/hid/Makefile | 15 ++-------------
drivers/hid/hid-core.c | 6 ++----
drivers/hid/hid-input.c | 6 ++----
3 files changed, 6 insertions(+), 21 deletions(-)

--- linux-2.6.20-rc6-mm1/drivers/hid/Makefile.old 2007-01-28 23:50:41.000000000 +0100
+++ linux-2.6.20-rc6-mm1/drivers/hid/Makefile 2007-01-29 00:13:22.000000000 +0100
@@ -2,18 +2,7 @@
# 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
-
-
obj-$(CONFIG_HID) += hid.o
+hid-objs := hid-core.o hid-input.o
+hid-$(CONFIG_HID_DEBUG) += hid-debug.o

--- linux-2.6.20-rc6-mm1/drivers/hid/hid-core.c.old 2007-01-28 23:52:34.000000000 +0100
+++ linux-2.6.20-rc6-mm1/drivers/hid/hid-core.c 2007-01-28 23:53:47.000000000 +0100
@@ -27,8 +27,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>
@@ -950,7 +948,7 @@
return -1;
}

-#ifdef DEBUG_DATA
+#ifdef CONFIG_INPUT_DEBUG
printk(KERN_DEBUG __FILE__ ": report (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un");
#endif

@@ -960,7 +958,7 @@
size--;
}

-#ifdef DEBUG_DATA
+#ifdef CONFIG_INPUT_DEBUG
{
int i;
printk(KERN_DEBUG __FILE__ ": report %d (size %u) = ", n, size);
--- linux-2.6.20-rc6-mm1/drivers/hid/hid-input.c.old 2007-01-28 23:53:56.000000000 +0100
+++ linux-2.6.20-rc6-mm1/drivers/hid/hid-input.c 2007-01-28 23:54:21.000000000 +0100
@@ -31,8 +31,6 @@
#include <linux/slab.h>
#include <linux/kernel.h>

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

@@ -248,7 +246,7 @@

field->hidinput = hidinput;

-#ifdef DEBUG
+#ifdef CONFIG_HID_DEBUG
printk(KERN_DEBUG "Mapping: ");
hid_resolv_usage(usage->hid);
printk(" ---> ");
@@ -685,7 +683,7 @@
return;

ignore:
-#ifdef DEBUG
+#ifdef CONFIG_HID_DEBUG
printk("IGNORED\n");
#endif
return;