From 3fbb0547afc53b49e32abea54fc7ef8a6ef269b4 Mon Sep 17 00:00:00 2001 From: Matt Sealey Date: Tue, 21 Dec 2010 17:03:59 -0600 Subject: [PATCH] hid: remove egregious idle timer stuff and clean up some whitespace --- drivers/hid/hid-core.c | 6 ------ drivers/hid/usbhid/hid-core.c | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index a72fb3bdfea..e435f5c629e 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -52,12 +52,6 @@ EXPORT_SYMBOL_GPL(hid_debug); #endif - -//inherited V28 ,2010.03.10 Byron -#ifdef CONFIG_MACH_MX51_EFIKASB -extern void mxc_reset_idle_timer(void); -#endif - /* * Register a new report for a device. */ diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 96f56c6e50e..e042cd87012 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1147,7 +1147,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id) #ifdef CONFIG_MACH_MX51_EFIKASB /* ron: skip the Logitech G15 GamePanel LCD */ - // inherited Ron's code , Byron 2010.03.10 + // inherited Ron's code , Byron 2010.03.10 if(hid->vendor == USB_VENDOR_ID_LOGITECH && hid->product == USB_DEVICE_ID_LOGITECH_G15_GAMEPANEL) { ret = -ENODEV; @@ -1155,7 +1155,6 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id) } #endif - hid->name[0] = 0; if (intf->cur_altsetting->desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE)