USB: remove info() macro from usb input drivers

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

diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 41caaef8e2d72c3a8e098086f9f0edbe44be48c8..09e227aa0d49d9f5bfea9efb3be7079116a82f79 100644 (file)
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -56,10 +56,10 @@ static void wacom_sys_irq(struct urb *urb)
        case -ENOENT:
        case -ESHUTDOWN:
                /* this urb is terminated, clean up */
-               dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
+               dbg("%s - urb shutting down with status: %d", __func__, urb->status);
                return;
        default:
-               dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
+               dbg("%s - nonzero urb status received: %d", __func__, urb->status);
                goto exit;
        }
 
@@ -70,10 +70,11 @@ static void wacom_sys_irq(struct urb *urb)
                input_sync(get_input_dev(&wcombo));
 
  exit:
+       usb_mark_last_busy(wacom->usbdev);
        retval = usb_submit_urb (urb, GFP_ATOMIC);
        if (retval)
                err ("%s - usb_submit_urb failed with result %d",
-                    __FUNCTION__, retval);
+                    __func__, retval);
 }
 
 void wacom_report_key(void *wcombo, unsigned int key_type, int key_data)
@@ -124,10 +125,25 @@ static int wacom_open(struct input_dev *dev)
 {
        struct wacom *wacom = input_get_drvdata(dev);
 
+       mutex_lock(&wacom->lock);
+
        wacom->irq->dev = wacom->usbdev;
-       if (usb_submit_urb(wacom->irq, GFP_KERNEL))
+
+       if (usb_autopm_get_interface(wacom->intf) < 0) {
+               mutex_unlock(&wacom->lock);
                return -EIO;
+       }
+
+       if (usb_submit_urb(wacom->irq, GFP_KERNEL)) {
+               usb_autopm_put_interface(wacom->intf);
+               mutex_unlock(&wacom->lock);
+               return -EIO;
+       }
+
+       wacom->open = 1;
+       wacom->intf->needs_remote_wakeup = 1;
 
+       mutex_unlock(&wacom->lock);
        return 0;
 }
 
@@ -135,7 +151,11 @@ static void wacom_close(struct input_dev *dev)
 {
        struct wacom *wacom = input_get_drvdata(dev);
 
+       mutex_lock(&wacom->lock);
        usb_kill_urb(wacom->irq);
+       wacom->open = 0;
+       wacom->intf->needs_remote_wakeup = 0;
+       mutex_unlock(&wacom->lock);
 }
 
 void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
@@ -243,6 +263,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 
        wacom->usbdev = dev;
        wacom->dev = input_dev;
+       wacom->intf = intf;
+       mutex_init(&wacom->lock);
        usb_make_path(dev, wacom->phys, sizeof(wacom->phys));
        strlcat(wacom->phys, "/input0", sizeof(wacom->phys));
 
@@ -304,23 +326,57 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 
 static void wacom_disconnect(struct usb_interface *intf)
 {
-       struct wacom *wacom = usb_get_intfdata (intf);
+       struct wacom *wacom = usb_get_intfdata(intf);
 
        usb_set_intfdata(intf, NULL);
-       if (wacom) {
-               usb_kill_urb(wacom->irq);
-               input_unregister_device(wacom->dev);
-               usb_free_urb(wacom->irq);
-               usb_buffer_free(interface_to_usbdev(intf), 10, wacom->wacom_wac->data, wacom->data_dma);
-               kfree(wacom->wacom_wac);
-               kfree(wacom);
-       }
+
+       usb_kill_urb(wacom->irq);
+       input_unregister_device(wacom->dev);
+       usb_free_urb(wacom->irq);
+       usb_buffer_free(interface_to_usbdev(intf), 10, wacom->wacom_wac->data, wacom->data_dma);
+       kfree(wacom->wacom_wac);
+       kfree(wacom);
+}
+
+static int wacom_suspend(struct usb_interface *intf, pm_message_t message)
+{
+       struct wacom *wacom = usb_get_intfdata(intf);
+
+       mutex_lock(&wacom->lock);
+       usb_kill_urb(wacom->irq);
+       mutex_unlock(&wacom->lock);
+
+       return 0;
+}
+
+static int wacom_resume(struct usb_interface *intf)
+{
+       struct wacom *wacom = usb_get_intfdata(intf);
+       int rv;
+
+       mutex_lock(&wacom->lock);
+       if (wacom->open)
+               rv = usb_submit_urb(wacom->irq, GFP_NOIO);
+       else
+               rv = 0;
+       mutex_unlock(&wacom->lock);
+
+       return rv;
+}
+
+static int wacom_reset_resume(struct usb_interface *intf)
+{
+       return wacom_resume(intf);
 }
 
 static struct usb_driver wacom_driver = {
        .name =         "wacom",
        .probe =        wacom_probe,
        .disconnect =   wacom_disconnect,
+       .suspend =      wacom_suspend,
+       .resume =       wacom_resume,
+       .reset_resume = wacom_reset_resume,
+       .supports_autosuspend = 1,
 };
 
 static int __init wacom_init(void)
@@ -329,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;
 }