Commit ddbe3249 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Jiri Kosina
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 0f492f2a
...@@ -1109,7 +1109,8 @@ static int __init hid_init(void) ...@@ -1109,7 +1109,8 @@ static int __init hid_init(void)
retval = usb_register(&hid_driver); retval = usb_register(&hid_driver);
if (retval) if (retval)
goto usb_register_fail; goto usb_register_fail;
info(DRIVER_VERSION ":" DRIVER_DESC); printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
DRIVER_DESC "\n");
return 0; return 0;
usb_register_fail: usb_register_fail:
......
...@@ -105,14 +105,16 @@ static void usb_kbd_irq(struct urb *urb) ...@@ -105,14 +105,16 @@ static void usb_kbd_irq(struct urb *urb)
if (usb_kbd_keycode[kbd->old[i]]) if (usb_kbd_keycode[kbd->old[i]])
input_report_key(kbd->dev, usb_kbd_keycode[kbd->old[i]], 0); input_report_key(kbd->dev, usb_kbd_keycode[kbd->old[i]], 0);
else 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 (kbd->new[i] > 3 && memscan(kbd->old + 2, kbd->new[i], 6) == kbd->old + 8) {
if (usb_kbd_keycode[kbd->new[i]]) if (usb_kbd_keycode[kbd->new[i]])
input_report_key(kbd->dev, usb_kbd_keycode[kbd->new[i]], 1); input_report_key(kbd->dev, usb_kbd_keycode[kbd->new[i]], 1);
else else
info("Unknown key (scancode %#x) pressed.", kbd->new[i]); dev_info(&urb->dev->dev,
"Unknown key (scancode %#x) released.\n", kbd->new[i]);
} }
} }
...@@ -352,7 +354,8 @@ static int __init usb_kbd_init(void) ...@@ -352,7 +354,8 @@ static int __init usb_kbd_init(void)
{ {
int result = usb_register(&usb_kbd_driver); int result = usb_register(&usb_kbd_driver);
if (result == 0) if (result == 0)
info(DRIVER_VERSION ":" DRIVER_DESC); printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
DRIVER_DESC "\n");
return result; return result;
} }
......
...@@ -245,7 +245,8 @@ static int __init usb_mouse_init(void) ...@@ -245,7 +245,8 @@ static int __init usb_mouse_init(void)
{ {
int retval = usb_register(&usb_mouse_driver); int retval = usb_register(&usb_mouse_driver);
if (retval == 0) if (retval == 0)
info(DRIVER_VERSION ":" DRIVER_DESC); printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
DRIVER_DESC "\n");
return retval; return retval;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment