Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB: remove info() macro from usb input drivers

Browse source 
USB should not be having it's own printk macros, so remove info() and
use the system-wide standard of dev_info() wherever possible.

Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2008-08-18 13:21:04 -07:00
parent 880c9c66a6
commit 899ef6e7cf
8 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/input/joystick/xpad.c
View file

@ -911,7 +911,7 @@ static int __init usb_xpad_init(void)
{ {
int result = usb_register(&xpad_driver); int result = usb_register(&xpad_driver);
if (result == 0) if (result == 0)
info(DRIVER_DESC); printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
return result; return result;
} }

6
drivers/input/misc/ati_remote.c
View file

@ -834,9 +834,11 @@ static int __init ati_remote_init(void)
result = usb_register(&ati_remote_driver); result = usb_register(&ati_remote_driver);
if (result) if (result)
err("usb_register error #%d\n", result); printk(KERN_ERR KBUILD_MODNAME
": usb_register error #%d\n", result);
else else
info("Registered USB driver " DRIVER_DESC " v. " DRIVER_VERSION); printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
DRIVER_DESC "\n");
return result; return result;
} }

3
drivers/input/misc/yealink.c
View file

@ -999,7 +999,8 @@ static int __init yealink_dev_init(void)
{ {
int ret = usb_register(&yealink_driver); int ret = usb_register(&yealink_driver);
if (ret == 0) if (ret == 0)
info(DRIVER_DESC ":" DRIVER_VERSION); printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
DRIVER_DESC "\n");
return ret; return ret;
} }

3
drivers/input/tablet/acecad.c
View file

@ -280,7 +280,8 @@ static int __init usb_acecad_init(void)
{ {
int result = usb_register(&usb_acecad_driver); int result = usb_register(&usb_acecad_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;
} }

11
drivers/input/tablet/aiptek.c
View file

@ -1844,7 +1844,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
aiptek->curSetting.programmableDelay = speeds[i]; aiptek->curSetting.programmableDelay = speeds[i];
(void)aiptek_program_tablet(aiptek); (void)aiptek_program_tablet(aiptek);
if (aiptek->inputdev->absmax[ABS_X] > 0) { if (aiptek->inputdev->absmax[ABS_X] > 0) {
info("input: Aiptek using %d ms programming speed\n", dev_info(&intf->dev,
"Aiptek using %d ms programming speed\n",
aiptek->curSetting.programmableDelay); aiptek->curSetting.programmableDelay);
break; break;
} }
@ -1853,7 +1854,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
/* Murphy says that some day someone will have a tablet that fails the /* Murphy says that some day someone will have a tablet that fails the
above test. That's you, Frederic Rodrigo */ above test. That's you, Frederic Rodrigo */
if (i == ARRAY_SIZE(speeds)) { if (i == ARRAY_SIZE(speeds)) {
info("input: Aiptek tried all speeds, no sane response"); dev_info(&intf->dev,
"Aiptek tried all speeds, no sane response\n");
goto fail2; goto fail2;
} }
@ -1925,8 +1927,9 @@ static int __init aiptek_init(void)
{ {
int result = usb_register(&aiptek_driver); int result = usb_register(&aiptek_driver);
if (result == 0) { if (result == 0) {
info(DRIVER_VERSION ": " DRIVER_AUTHOR); printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
info(DRIVER_DESC); DRIVER_DESC "\n");
printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_AUTHOR "\n");
} }
return result; return result;
} }

4
drivers/input/tablet/gtco.c
View file

@ -2,7 +2,7 @@
GTCO digitizer USB driver GTCO digitizer USB driver
Use the err(), dbg() and info() macros from usb.h for system logging Use the err() and dbg() macros from usb.h for system logging
TO CHECK: Is pressure done right on report 5? TO CHECK: Is pressure done right on report 5?
@ -1010,7 +1010,7 @@ static void gtco_disconnect(struct usb_interface *interface)
kfree(gtco); kfree(gtco);
} }
info("gtco driver disconnected"); dev_info(&interface->dev, "gtco driver disconnected\n");
} }
/* STANDARD MODULE LOAD ROUTINES */ /* STANDARD MODULE LOAD ROUTINES */

3
drivers/input/tablet/kbtab.c
View file

@ -215,7 +215,8 @@ static int __init kbtab_init(void)
retval = usb_register(&kbtab_driver); retval = usb_register(&kbtab_driver);
if (retval) if (retval)
goto out; goto out;
info(DRIVER_VERSION ":" DRIVER_DESC); printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
DRIVER_DESC "\n");
out: out:
return retval; return retval;
} }

3
drivers/input/tablet/wacom_sys.c
View file

@ -385,7 +385,8 @@ static int __init wacom_init(void)
wacom_driver.id_table = get_device_table(); wacom_driver.id_table = get_device_table();
result = usb_register(&wacom_driver); result = usb_register(&wacom_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;
} }