USB: remove info() macro from usb input drivers
Greg Kroah-Hartman [Mon, 18 Aug 2008 20:21:04 +0000 (13:21 -0700)]
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>

drivers/input/joystick/xpad.c
drivers/input/misc/ati_remote.c
drivers/input/misc/yealink.c
drivers/input/tablet/acecad.c
drivers/input/tablet/aiptek.c
drivers/input/tablet/gtco.c
drivers/input/tablet/kbtab.c
drivers/input/tablet/wacom_sys.c

index 839d1c9..b868b8d 100644 (file)
@@ -911,7 +911,7 @@ static int __init usb_xpad_init(void)
 {
        int result = usb_register(&xpad_driver);
        if (result == 0)
-               info(DRIVER_DESC);
+               printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
        return result;
 }
 
index 428ecd3..e290fde 100644 (file)
@@ -834,9 +834,11 @@ static int __init ati_remote_init(void)
 
        result = usb_register(&ati_remote_driver);
        if (result)
-               err("usb_register error #%d\n", result);
+               printk(KERN_ERR KBUILD_MODNAME
+                      ": usb_register error #%d\n", result);
        else
-               info("Registered USB driver " DRIVER_DESC " v. " DRIVER_VERSION);
+               printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                      DRIVER_DESC "\n");
 
        return result;
 }
index 11b5c7e..93a22ac 100644 (file)
@@ -999,7 +999,8 @@ static int __init yealink_dev_init(void)
 {
        int ret = usb_register(&yealink_driver);
        if (ret == 0)
-               info(DRIVER_DESC ":" DRIVER_VERSION);
+               printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                      DRIVER_DESC "\n");
        return ret;
 }
 
index 570e0e8..670c61c 100644 (file)
@@ -280,7 +280,8 @@ static int __init usb_acecad_init(void)
 {
        int result = usb_register(&usb_acecad_driver);
        if (result == 0)
-               info(DRIVER_VERSION ":" DRIVER_DESC);
+               printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                      DRIVER_DESC "\n");
        return result;
 }
 
index 1aa82e8..7d005a3 100644 (file)
@@ -1844,8 +1844,9 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
                aiptek->curSetting.programmableDelay = speeds[i];
                (void)aiptek_program_tablet(aiptek);
                if (aiptek->inputdev->absmax[ABS_X] > 0) {
-                       info("input: Aiptek using %d ms programming speed\n",
-                            aiptek->curSetting.programmableDelay);
+                       dev_info(&intf->dev,
+                                "Aiptek using %d ms programming speed\n",
+                                aiptek->curSetting.programmableDelay);
                        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
           above test. That's you, Frederic Rodrigo */
        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;
        }
 
@@ -1925,8 +1927,9 @@ static int __init aiptek_init(void)
 {
        int result = usb_register(&aiptek_driver);
        if (result == 0) {
-               info(DRIVER_VERSION ": " DRIVER_AUTHOR);
-               info(DRIVER_DESC);
+               printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                      DRIVER_DESC "\n");
+               printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_AUTHOR "\n");
        }
        return result;
 }
index 7df0228..5524e01 100644 (file)
@@ -2,7 +2,7 @@
 
 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?
 
@@ -1010,7 +1010,7 @@ static void gtco_disconnect(struct usb_interface *interface)
                kfree(gtco);
        }
 
-       info("gtco driver disconnected");
+       dev_info(&interface->dev, "gtco driver disconnected\n");
 }
 
 /*   STANDARD MODULE LOAD ROUTINES  */
index d89112f..6682b17 100644 (file)
@@ -215,7 +215,8 @@ static int __init kbtab_init(void)
        retval = usb_register(&kbtab_driver);
        if (retval)
                goto out;
-       info(DRIVER_VERSION ":" DRIVER_DESC);
+       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+              DRIVER_DESC "\n");
 out:
        return retval;
 }
index 5fbc463..09e227a 100644 (file)
@@ -385,7 +385,8 @@ static int __init wacom_init(void)
        wacom_driver.id_table = get_device_table();
        result = usb_register(&wacom_driver);
        if (result == 0)
-               info(DRIVER_VERSION ":" DRIVER_DESC);
+               printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                      DRIVER_DESC "\n");
        return result;
 }