aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-08-18 16:21:04 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-17 17:41:10 -0400
commit899ef6e7cf2f057fcfd8071b36de04117313242b (patch)
tree59229f8188930f6c043177b3f7e0e5eeb91d3d4c /drivers
parent880c9c66a60c0aa4fb4dac2da9679da5f8f41903 (diff)
USB: remove info() macro from usb input 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. Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/joystick/xpad.c2
-rw-r--r--drivers/input/misc/ati_remote.c6
-rw-r--r--drivers/input/misc/yealink.c3
-rw-r--r--drivers/input/tablet/acecad.c3
-rw-r--r--drivers/input/tablet/aiptek.c13
-rw-r--r--drivers/input/tablet/gtco.c4
-rw-r--r--drivers/input/tablet/kbtab.c3
-rw-r--r--drivers/input/tablet/wacom_sys.c3
8 files changed, 23 insertions, 14 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 839d1c9622f..b868b8d5fbb 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -911,7 +911,7 @@ static int __init usb_xpad_init(void)
911{ 911{
912 int result = usb_register(&xpad_driver); 912 int result = usb_register(&xpad_driver);
913 if (result == 0) 913 if (result == 0)
914 info(DRIVER_DESC); 914 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
915 return result; 915 return result;
916} 916}
917 917
diff --git a/drivers/input/misc/ati_remote.c b/drivers/input/misc/ati_remote.c
index 428ecd3294a..e290fde35e7 100644
--- a/drivers/input/misc/ati_remote.c
+++ b/drivers/input/misc/ati_remote.c
@@ -834,9 +834,11 @@ static int __init ati_remote_init(void)
834 834
835 result = usb_register(&ati_remote_driver); 835 result = usb_register(&ati_remote_driver);
836 if (result) 836 if (result)
837 err("usb_register error #%d\n", result); 837 printk(KERN_ERR KBUILD_MODNAME
838 ": usb_register error #%d\n", result);
838 else 839 else
839 info("Registered USB driver " DRIVER_DESC " v. " DRIVER_VERSION); 840 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
841 DRIVER_DESC "\n");
840 842
841 return result; 843 return result;
842} 844}
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index 11b5c7e84ed..93a22ac0f88 100644
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -999,7 +999,8 @@ static int __init yealink_dev_init(void)
999{ 999{
1000 int ret = usb_register(&yealink_driver); 1000 int ret = usb_register(&yealink_driver);
1001 if (ret == 0) 1001 if (ret == 0)
1002 info(DRIVER_DESC ":" DRIVER_VERSION); 1002 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
1003 DRIVER_DESC "\n");
1003 return ret; 1004 return ret;
1004} 1005}
1005 1006
diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c
index 570e0e83ac4..670c61c5a51 100644
--- a/drivers/input/tablet/acecad.c
+++ b/drivers/input/tablet/acecad.c
@@ -280,7 +280,8 @@ static int __init usb_acecad_init(void)
280{ 280{
281 int result = usb_register(&usb_acecad_driver); 281 int result = usb_register(&usb_acecad_driver);
282 if (result == 0) 282 if (result == 0)
283 info(DRIVER_VERSION ":" DRIVER_DESC); 283 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
284 DRIVER_DESC "\n");
284 return result; 285 return result;
285} 286}
286 287
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index 1aa82e8af61..7d005a3616d 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -1844,8 +1844,9 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
1844 aiptek->curSetting.programmableDelay = speeds[i]; 1844 aiptek->curSetting.programmableDelay = speeds[i];
1845 (void)aiptek_program_tablet(aiptek); 1845 (void)aiptek_program_tablet(aiptek);
1846 if (aiptek->inputdev->absmax[ABS_X] > 0) { 1846 if (aiptek->inputdev->absmax[ABS_X] > 0) {
1847 info("input: Aiptek using %d ms programming speed\n", 1847 dev_info(&intf->dev,
1848 aiptek->curSetting.programmableDelay); 1848 "Aiptek using %d ms programming speed\n",
1849 aiptek->curSetting.programmableDelay);
1849 break; 1850 break;
1850 } 1851 }
1851 } 1852 }
@@ -1853,7 +1854,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
1853 /* Murphy says that some day someone will have a tablet that fails the 1854 /* Murphy says that some day someone will have a tablet that fails the
1854 above test. That's you, Frederic Rodrigo */ 1855 above test. That's you, Frederic Rodrigo */
1855 if (i == ARRAY_SIZE(speeds)) { 1856 if (i == ARRAY_SIZE(speeds)) {
1856 info("input: Aiptek tried all speeds, no sane response"); 1857 dev_info(&intf->dev,
1858 "Aiptek tried all speeds, no sane response\n");
1857 goto fail2; 1859 goto fail2;
1858 } 1860 }
1859 1861
@@ -1925,8 +1927,9 @@ static int __init aiptek_init(void)
1925{ 1927{
1926 int result = usb_register(&aiptek_driver); 1928 int result = usb_register(&aiptek_driver);
1927 if (result == 0) { 1929 if (result == 0) {
1928 info(DRIVER_VERSION ": " DRIVER_AUTHOR); 1930 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
1929 info(DRIVER_DESC); 1931 DRIVER_DESC "\n");
1932 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_AUTHOR "\n");
1930 } 1933 }
1931 return result; 1934 return result;
1932} 1935}
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
index 7df0228e836..5524e01dbb1 100644
--- a/drivers/input/tablet/gtco.c
+++ b/drivers/input/tablet/gtco.c
@@ -2,7 +2,7 @@
2 2
3GTCO digitizer USB driver 3GTCO digitizer USB driver
4 4
5Use the err(), dbg() and info() macros from usb.h for system logging 5Use the err() and dbg() macros from usb.h for system logging
6 6
7TO CHECK: Is pressure done right on report 5? 7TO CHECK: Is pressure done right on report 5?
8 8
@@ -1010,7 +1010,7 @@ static void gtco_disconnect(struct usb_interface *interface)
1010 kfree(gtco); 1010 kfree(gtco);
1011 } 1011 }
1012 1012
1013 info("gtco driver disconnected"); 1013 dev_info(&interface->dev, "gtco driver disconnected\n");
1014} 1014}
1015 1015
1016/* STANDARD MODULE LOAD ROUTINES */ 1016/* STANDARD MODULE LOAD ROUTINES */
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c
index d89112fa6e6..6682b17bf84 100644
--- a/drivers/input/tablet/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
@@ -215,7 +215,8 @@ static int __init kbtab_init(void)
215 retval = usb_register(&kbtab_driver); 215 retval = usb_register(&kbtab_driver);
216 if (retval) 216 if (retval)
217 goto out; 217 goto out;
218 info(DRIVER_VERSION ":" DRIVER_DESC); 218 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
219 DRIVER_DESC "\n");
219out: 220out:
220 return retval; 221 return retval;
221} 222}
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 5fbc463baf5..09e227aa0d4 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -385,7 +385,8 @@ static int __init wacom_init(void)
385 wacom_driver.id_table = get_device_table(); 385 wacom_driver.id_table = get_device_table();
386 result = usb_register(&wacom_driver); 386 result = usb_register(&wacom_driver);
387 if (result == 0) 387 if (result == 0)
388 info(DRIVER_VERSION ":" DRIVER_DESC); 388 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
389 DRIVER_DESC "\n");
389 return result; 390 return result;
390} 391}
391 392