Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 899ef6e7cf2f057fcfd8071b36de04117313242b

Authored by Greg Kroah-Hartman
1 parent 880c9c66a6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 8 changed files with 23 additions and 14 deletions Side-by-side Diff

drivers/input/joystick/xpad.c
Diff comments   View file @ 899ef6e
... ... @@ -911,7 +911,7 @@
911 911 {
912 912 int result = usb_register(&xpad_driver);
913 913 if (result == 0)
914   - info(DRIVER_DESC);
  914 + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
915 915 return result;
916 916 }
917 917  
drivers/input/misc/ati_remote.c
Diff comments   View file @ 899ef6e
... ... @@ -834,9 +834,11 @@
834 834  
835 835 result = usb_register(&ati_remote_driver);
836 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 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 843 return result;
842 844 }
drivers/input/misc/yealink.c
Diff comments   View file @ 899ef6e
... ... @@ -999,7 +999,8 @@
999 999 {
1000 1000 int ret = usb_register(&yealink_driver);
1001 1001 if (ret == 0)
1002   - info(DRIVER_DESC ":" DRIVER_VERSION);
  1002 + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
  1003 + DRIVER_DESC "\n");
1003 1004 return ret;
1004 1005 }
1005 1006  
drivers/input/tablet/acecad.c
Diff comments   View file @ 899ef6e
... ... @@ -280,7 +280,8 @@
280 280 {
281 281 int result = usb_register(&usb_acecad_driver);
282 282 if (result == 0)
283   - info(DRIVER_VERSION ":" DRIVER_DESC);
  283 + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
  284 + DRIVER_DESC "\n");
284 285 return result;
285 286 }
286 287  
drivers/input/tablet/aiptek.c
Diff comments   View file @ 899ef6e
... ... @@ -1844,8 +1844,9 @@
1844 1844 aiptek->curSetting.programmableDelay = speeds[i];
1845 1845 (void)aiptek_program_tablet(aiptek);
1846 1846 if (aiptek->inputdev->absmax[ABS_X] > 0) {
1847   - info("input: Aiptek using %d ms programming speed\n",
1848   - aiptek->curSetting.programmableDelay);
  1847 + dev_info(&intf->dev,
  1848 + "Aiptek using %d ms programming speed\n",
  1849 + aiptek->curSetting.programmableDelay);
1849 1850 break;
1850 1851 }
1851 1852 }
... ... @@ -1853,7 +1854,8 @@
1853 1854 /* Murphy says that some day someone will have a tablet that fails the
1854 1855 above test. That's you, Frederic Rodrigo */
1855 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 1859 goto fail2;
1858 1860 }
1859 1861  
... ... @@ -1925,8 +1927,9 @@
1925 1927 {
1926 1928 int result = usb_register(&aiptek_driver);
1927 1929 if (result == 0) {
1928   - info(DRIVER_VERSION ": " DRIVER_AUTHOR);
1929   - info(DRIVER_DESC);
  1930 + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
  1931 + DRIVER_DESC "\n");
  1932 + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_AUTHOR "\n");
1930 1933 }
1931 1934 return result;
1932 1935 }
drivers/input/tablet/gtco.c
Diff comments   View file @ 899ef6e
... ... @@ -2,7 +2,7 @@
2 2  
3 3 GTCO digitizer USB driver
4 4  
5   -Use the err(), dbg() and info() macros from usb.h for system logging
  5 +Use the err() and dbg() macros from usb.h for system logging
6 6  
7 7 TO CHECK: Is pressure done right on report 5?
8 8  
... ... @@ -1010,7 +1010,7 @@
1010 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 1016 /* STANDARD MODULE LOAD ROUTINES */
drivers/input/tablet/kbtab.c
Diff comments   View file @ 899ef6e
... ... @@ -215,7 +215,8 @@
215 215 retval = usb_register(&kbtab_driver);
216 216 if (retval)
217 217 goto out;
218   - info(DRIVER_VERSION ":" DRIVER_DESC);
  218 + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
  219 + DRIVER_DESC "\n");
219 220 out:
220 221 return retval;
221 222 }
drivers/input/tablet/wacom_sys.c
Diff comments   View file @ 899ef6e
... ... @@ -385,7 +385,8 @@
385 385 wacom_driver.id_table = get_device_table();
386 386 result = usb_register(&wacom_driver);
387 387 if (result == 0)
388   - info(DRIVER_VERSION ":" DRIVER_DESC);
  388 + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
  389 + DRIVER_DESC "\n");
389 390 return result;
390 391 }
391 392