Merge branches 'upstream', 'upstream-fixes' and 'debugfs' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / hid / usbhid / hid-core.c

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 25f38a5af26931bff9d99c7c370eb07e8325b939..1b0e07a67d6d079c26848f42b28ce6835bdb6014 100644 (file)
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -4,8 +4,8 @@
  *  Copyright (c) 1999 Andreas Gal
  *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
  *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
- *  Copyright (c) 2006-2008 Jiri Kosina
  *  Copyright (c) 2007-2008 Oliver Neukum
+ *  Copyright (c) 2006-2009 Jiri Kosina
  */
 
 /*
@@ -886,11 +886,6 @@ static int usbhid_parse(struct hid_device *hid)
                goto err;
        }
 
-       dbg_hid("report descriptor (size %u, read %d) = ", rsize, n);
-       for (n = 0; n < rsize; n++)
-               dbg_hid_line(" %02x", (unsigned char) rdesc[n]);
-       dbg_hid_line("\n");
-
        ret = hid_parse_report(hid, rdesc, rsize);
        kfree(rdesc);
        if (ret) {
@@ -1004,7 +999,6 @@ static int usbhid_start(struct hid_device *hid)
        usbhid->urbctrl->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);
 
        usbhid_init_reports(hid);
-       hid_dump_device(hid);
 
        set_bit(HID_STARTED, &usbhid->iofl);