1 files changed, 17 insertions, 11 deletions

diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index 205d16aab44..755a39e4c9e 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -309,6 +309,7 @@ struct aiptek_settings {
 struct aiptek {
         struct input_dev *inputdev;             /* input device struct           */
         struct usb_device *usbdev;              /* usb device struct             */
+        struct usb_interface *intf;             /* usb interface struct          */
         struct urb *urb;                        /* urb for incoming reports      */
         dma_addr_t data_dma;                    /* our dma stuffage              */
         struct aiptek_features features;        /* tablet's array of features    */
@@ -435,6 +436,7 @@ static void aiptek_irq(struct urb *urb)
         struct aiptek *aiptek = urb->context;
         unsigned char *data = aiptek->data;
         struct input_dev *inputdev = aiptek->inputdev;
+        struct usb_interface *intf = aiptek->intf;
         int jitterable = 0;
         int retval, macro, x, y, z, left, right, middle, p, dv, tip, bs, pck;
 
@@ -447,13 +449,13 @@ static void aiptek_irq(struct urb *urb)
         case -ENOENT:
         case -ESHUTDOWN:
                 /* This urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d",
-                    __func__, urb->status);
+                dev_dbg(&intf->dev, "%s - urb shutting down with status: %d\n",
+                        __func__, urb->status);
                 return;
 
         default:
-                dbg("%s - nonzero urb status received: %d",
-                    __func__, urb->status);
+                dev_dbg(&intf->dev, "%s - nonzero urb status received: %d\n",
+                        __func__, urb->status);
                 goto exit;
         }
 
@@ -785,7 +787,7 @@ static void aiptek_irq(struct urb *urb)
                                  1 | AIPTEK_REPORT_TOOL_UNKNOWN);
                 input_sync(inputdev);
         } else {
-                dbg("Unknown report %d", data[0]);
+                dev_dbg(&intf->dev, "Unknown report %d\n", data[0]);
         }
 
         /* Jitter may occur when the user presses a button on the stlyus
@@ -811,8 +813,9 @@ static void aiptek_irq(struct urb *urb)
 exit:
         retval = usb_submit_urb(urb, GFP_ATOMIC);
         if (retval != 0) {
-                err("%s - usb_submit_urb failed with result %d",
-                    __func__, retval);
+                dev_err(&intf->dev,
+                        "%s - usb_submit_urb failed with result %d\n",
+                        __func__, retval);
         }
 }
 
@@ -912,8 +915,9 @@ aiptek_command(struct aiptek *aiptek, unsigned char command, unsigned char data)
 
         if ((ret =
              aiptek_set_report(aiptek, 3, 2, buf, sizeof_buf)) != sizeof_buf) {
-                dbg("aiptek_program: failed, tried to send: 0x%02x 0x%02x",
-                    command, data);
+                dev_dbg(&aiptek->intf->dev,
+                        "aiptek_program: failed, tried to send: 0x%02x 0x%02x\n",
+                        command, data);
         }
         kfree(buf);
         return ret < 0 ? ret : 0;
@@ -947,8 +951,9 @@ aiptek_query(struct aiptek *aiptek, unsigned char command, unsigned char data)
 
         if ((ret =
              aiptek_get_report(aiptek, 3, 2, buf, sizeof_buf)) != sizeof_buf) {
-                dbg("aiptek_query failed: returned 0x%02x 0x%02x 0x%02x",
-                    buf[0], buf[1], buf[2]);
+                dev_dbg(&aiptek->intf->dev,
+                        "aiptek_query failed: returned 0x%02x 0x%02x 0x%02x\n",
+                        buf[0], buf[1], buf[2]);
                 ret = -EIO;
         } else {
                 ret = get_unaligned_le16(buf + 1);
@@ -1726,6 +1731,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
         aiptek->inputdev = inputdev;
         aiptek->usbdev = usbdev;
+        aiptek->intf = intf;
         aiptek->ifnum = intf->altsetting[0].desc.bInterfaceNumber;
         aiptek->inDelay = 0;
         aiptek->endDelay = 0;