Commit 899ef6e7cf2f057fcfd8071b36de04117313242b
1 parent
880c9c66a6
Exists in
master
and in
7 other branches
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
drivers/input/misc/ati_remote.c
... | ... | @@ -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
drivers/input/tablet/acecad.c
drivers/input/tablet/aiptek.c
... | ... | @@ -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
... | ... | @@ -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
drivers/input/tablet/wacom_sys.c
... | ... | @@ -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 |