USB: remove info() macro from usb input drivers

[linux-2.6-omap-h63xx.git] / drivers / input / tablet / aiptek.c

diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index e53c838f1866cb69ddc33d2b9def78430777529e..7d005a3616d7187b1f228ebf10136df46228b67e 100644 (file)
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -1706,20 +1706,21 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
        aiptek = kzalloc(sizeof(struct aiptek), GFP_KERNEL);
        inputdev = input_allocate_device();
        if (!aiptek || !inputdev) {
-               warn("aiptek: cannot allocate memory or input device");
+               dev_warn(&intf->dev,
+                        "cannot allocate memory or input device\n");
                goto fail1;
         }
 
        aiptek->data = usb_buffer_alloc(usbdev, AIPTEK_PACKET_LENGTH,
                                        GFP_ATOMIC, &aiptek->data_dma);
         if (!aiptek->data) {
-               warn("aiptek: cannot allocate usb buffer");
+               dev_warn(&intf->dev, "cannot allocate usb buffer\n");
                goto fail1;
        }
 
        aiptek->urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!aiptek->urb) {
-               warn("aiptek: cannot allocate urb");
+               dev_warn(&intf->dev, "cannot allocate urb\n");
                goto fail2;
        }
 
@@ -1843,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;
                }
        }
@@ -1852,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;
        }
 
@@ -1864,7 +1867,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
         */
        err = sysfs_create_group(&intf->dev.kobj, &aiptek_attribute_group);
        if (err) {
-               warn("aiptek: cannot create sysfs group err: %d", err);
+               dev_warn(&intf->dev, "cannot create sysfs group err: %d\n",
+                        err);
                goto fail3;
         }
 
@@ -1872,7 +1876,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
         */
        err = input_register_device(aiptek->inputdev);
        if (err) {
-               warn("aiptek: input_register_device returned err: %d", err);
+               dev_warn(&intf->dev,
+                        "input_register_device returned err: %d\n", err);
                goto fail4;
         }
        return 0;
@@ -1922,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;
 }