Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd64c151 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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: default avatarJiri Kosina <jkosina@suse.cz>
parent 43c7bf04

drivers/hid/Makefile

+2 −13
Original line number Diff line number Diff line 
#

# 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-$(CONFIG_HID_DEBUG)		+= hid-debug.o

drivers/hid/hid-core.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

drivers/hid/hid-debug.c

+0 −1
Original line number Diff line number Diff line
@@ -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 {

drivers/hid/hid-input.c

+2 −4
Original line number Diff line number Diff line
@@ -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;