diff options
Diffstat (limited to 'drivers/hid/usbhid/usbkbd.c')
-rw-r--r-- | drivers/hid/usbhid/usbkbd.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c index 0caaafe01843..b342926dd7fc 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 | ||
@@ -159,7 +161,8 @@ static void usb_kbd_led(struct urb *urb) | |||
159 | struct usb_kbd *kbd = urb->context; | 161 | struct usb_kbd *kbd = urb->context; |
160 | 162 | ||
161 | if (urb->status) | 163 | if (urb->status) |
162 | warn("led urb status %d received", urb->status); | 164 | dev_warn(&urb->dev->dev, "led urb status %d received\n", |
165 | urb->status); | ||
163 | 166 | ||
164 | if (*(kbd->leds) == kbd->newleds) | 167 | if (*(kbd->leds) == kbd->newleds) |
165 | return; | 168 | return; |
@@ -352,7 +355,8 @@ static int __init usb_kbd_init(void) | |||
352 | { | 355 | { |
353 | int result = usb_register(&usb_kbd_driver); | 356 | int result = usb_register(&usb_kbd_driver); |
354 | if (result == 0) | 357 | if (result == 0) |
355 | info(DRIVER_VERSION ":" DRIVER_DESC); | 358 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
359 | DRIVER_DESC "\n"); | ||
356 | return result; | 360 | return result; |
357 | } | 361 | } |
358 | 362 | ||