diff options
-rw-r--r-- | drivers/hid/usbhid/hid-core.c | 3 | ||||
-rw-r--r-- | drivers/hid/usbhid/usbkbd.c | 9 | ||||
-rw-r--r-- | drivers/hid/usbhid/usbmouse.c | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 1ae047cd4fa1..34649d251d85 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c | |||
@@ -1109,7 +1109,8 @@ static int __init hid_init(void) | |||
1109 | retval = usb_register(&hid_driver); | 1109 | retval = usb_register(&hid_driver); |
1110 | if (retval) | 1110 | if (retval) |
1111 | goto usb_register_fail; | 1111 | goto usb_register_fail; |
1112 | info(DRIVER_VERSION ":" DRIVER_DESC); | 1112 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
1113 | DRIVER_DESC "\n"); | ||
1113 | 1114 | ||
1114 | return 0; | 1115 | return 0; |
1115 | usb_register_fail: | 1116 | usb_register_fail: |
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c index 0caaafe01843..d400afdaf2b3 100644 --- a/drivers/hid/usbhid/usbkbd.c +++ b/drivers/hid/usbhid/usbkbd.c | |||
@@ -105,14 +105,16 @@ static void usb_kbd_irq(struct urb *urb) | |||
105 | if (usb_kbd_keycode[kbd->old[i]]) | 105 | if (usb_kbd_keycode[kbd->old[i]]) |
106 | input_report_key(kbd->dev, usb_kbd_keycode[kbd->old[i]], 0); | 106 | input_report_key(kbd->dev, usb_kbd_keycode[kbd->old[i]], 0); |
107 | else | 107 | else |
108 | info("Unknown key (scancode %#x) released.", kbd->old[i]); | 108 | dev_info(&urb->dev->dev, |
109 | "Unknown key (scancode %#x) released.\n", kbd->old[i]); | ||
109 | } | 110 | } |
110 | 111 | ||
111 | if (kbd->new[i] > 3 && memscan(kbd->old + 2, kbd->new[i], 6) == kbd->old + 8) { | 112 | if (kbd->new[i] > 3 && memscan(kbd->old + 2, kbd->new[i], 6) == kbd->old + 8) { |
112 | if (usb_kbd_keycode[kbd->new[i]]) | 113 | if (usb_kbd_keycode[kbd->new[i]]) |
113 | input_report_key(kbd->dev, usb_kbd_keycode[kbd->new[i]], 1); | 114 | input_report_key(kbd->dev, usb_kbd_keycode[kbd->new[i]], 1); |
114 | else | 115 | else |
115 | info("Unknown key (scancode %#x) pressed.", kbd->new[i]); | 116 | dev_info(&urb->dev->dev, |
117 | "Unknown key (scancode %#x) released.\n", kbd->new[i]); | ||
116 | } | 118 | } |
117 | } | 119 | } |
118 | 120 | ||
@@ -352,7 +354,8 @@ static int __init usb_kbd_init(void) | |||
352 | { | 354 | { |
353 | int result = usb_register(&usb_kbd_driver); | 355 | int result = usb_register(&usb_kbd_driver); |
354 | if (result == 0) | 356 | if (result == 0) |
355 | info(DRIVER_VERSION ":" DRIVER_DESC); | 357 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
358 | DRIVER_DESC "\n"); | ||
356 | return result; | 359 | return result; |
357 | } | 360 | } |
358 | 361 | ||
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c index a89646a3c1fc..72ab4b268096 100644 --- a/drivers/hid/usbhid/usbmouse.c +++ b/drivers/hid/usbhid/usbmouse.c | |||
@@ -245,7 +245,8 @@ static int __init usb_mouse_init(void) | |||
245 | { | 245 | { |
246 | int retval = usb_register(&usb_mouse_driver); | 246 | int retval = usb_register(&usb_mouse_driver); |
247 | if (retval == 0) | 247 | if (retval == 0) |
248 | info(DRIVER_VERSION ":" DRIVER_DESC); | 248 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
249 | DRIVER_DESC "\n"); | ||
249 | return retval; | 250 | return retval; |
250 | } | 251 | } |
251 | 252 | ||