HID: remove info() macro from usb HID drivers

[linux-2.6-omap-h63xx.git] / drivers / hid / usbhid / usbkbd.c

diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index d7212ac89233fe86f8defdadf1f16c40a854f49e..d400afdaf2b32f37bf8b289a6c1ac35ce1ee973a 100644 (file)
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -105,14 +105,16 @@ static void usb_kbd_irq(struct urb *urb)
                        if (usb_kbd_keycode[kbd->old[i]])
                                input_report_key(kbd->dev, usb_kbd_keycode[kbd->old[i]], 0);
                        else
-                               info("Unknown key (scancode %#x) released.", kbd->old[i]);
+                               dev_info(&urb->dev->dev,
+                                               "Unknown key (scancode %#x) released.\n", kbd->old[i]);
                }
 
                if (kbd->new[i] > 3 && memscan(kbd->old + 2, kbd->new[i], 6) == kbd->old + 8) {
                        if (usb_kbd_keycode[kbd->new[i]])
                                input_report_key(kbd->dev, usb_kbd_keycode[kbd->new[i]], 1);
                        else
-                               info("Unknown key (scancode %#x) pressed.", kbd->new[i]);
+                               dev_info(&urb->dev->dev,
+                                               "Unknown key (scancode %#x) released.\n", kbd->new[i]);
                }
        }
 
@@ -233,14 +235,6 @@ static int usb_kbd_probe(struct usb_interface *iface,
        if (!usb_endpoint_is_int_in(endpoint))
                return -ENODEV;
 
-#ifdef CONFIG_USB_HID_MODULE
-       if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
-                               le16_to_cpu(dev->descriptor.idProduct))
-                       & HID_QUIRK_IGNORE) {
-               return -ENODEV;
-       }
-#endif
-
        pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
        maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
 
@@ -360,7 +354,8 @@ static int __init usb_kbd_init(void)
 {
        int result = usb_register(&usb_kbd_driver);
        if (result == 0)
-               info(DRIVER_VERSION ":" DRIVER_DESC);
+               printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                               DRIVER_DESC "\n");
        return result;
 }