aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet/aiptek.c
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/input/tablet/aiptek.c
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/input/tablet/aiptek.c')
-rw-r--r--drivers/input/tablet/aiptek.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index 1aa82e8af614..7d005a3616d7 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}