diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-11 18:14:23 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-10-14 17:51:03 -0400 |
commit | ddbe32491951c092abbd3647fd104e79deb19528 (patch) | |
tree | 77fd65b01a4f6199e9e6de82e403ed1f14be47c0 /drivers/hid/usbhid/usbkbd.c | |
parent | 0f492f2aa908edea5e23c4b0d033b858cd90ea37 (diff) |
HID: remove info() macro from usb HID drivers
USB should not be having it's own printk macros, so remove info() and
use the system-wide standard of dev_info() wherever possible.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid/usbkbd.c')
-rw-r--r-- | drivers/hid/usbhid/usbkbd.c | 9 |
1 files changed, 6 insertions, 3 deletions
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 | ||