Further cleanup making the debug messages more precise, useful
and removing mere trace points.

Signed-off-by: Oliver Neukum <[email protected]>
---
 drivers/usb/class/cdc-acm.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 7c21567..541300d 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -370,7 +370,7 @@ static int acm_submit_read_urb(struct acm *acm, int index, 
gfp_t mem_flags)
        if (res) {
                if (res != -EPERM) {
                        dev_err(&acm->data->dev,
-                                       "urb %d failed submission with %\n",
+                                       "urb %d failed submission with %d\n",
                                        index, res);
                }
                set_bit(index, &acm->read_urbs_free);
@@ -413,8 +413,9 @@ static void acm_read_bulk_callback(struct urb *urb)
        unsigned long flags;
        int status = urb->status;
 
-       dev_vdbg(&acm->data->dev, "%s - urb %d, len %d\n", __func__,
-                                       rb->index, urb->actual_length);
+       dev_vdbg(&acm->data->dev, "got urb %d, len %d, status %d\n",
+                                       rb->index, urb->actual_length,
+                                       status);
 
        if (!acm->dev) {
                set_bit(rb->index, &acm->read_urbs_free);
@@ -424,8 +425,6 @@ static void acm_read_bulk_callback(struct urb *urb)
 
        if (status) {
                set_bit(rb->index, &acm->read_urbs_free);
-               dev_dbg(&acm->data->dev, "non-zero bulk urb status: %d\n",
-                                               status);
                if ((status != -ENOENT) || (urb->actual_length == 0))
                        return;
        }
@@ -460,8 +459,7 @@ static void acm_write_bulk(struct urb *urb)
        int status = urb->status;
 
        if (status || (urb->actual_length != urb->transfer_buffer_length))
-               dev_vdbg(&acm->data->dev, "%s - len %d/%d, status %d\n",
-                       __func__,
+               dev_vdbg(&acm->data->dev, "wrote len %d/%d, status %d\n",
                        urb->actual_length,
                        urb->transfer_buffer_length,
                        status);
@@ -476,8 +474,6 @@ static void acm_softint(struct work_struct *work)
 {
        struct acm *acm = container_of(work, struct acm, work);
 
-       dev_vdbg(&acm->data->dev, "%s\n", __func__);
-
        tty_port_tty_wakeup(&acm->port);
 }
 
@@ -672,7 +668,7 @@ static int acm_tty_write(struct tty_struct *tty,
        if (!count)
                return 0;
 
-       dev_vdbg(&acm->data->dev, "%s - count %d\n", __func__, count);
+       dev_vdbg(&acm->data->dev, "%d bytes from tty layer\n", count);
 
        spin_lock_irqsave(&acm->write_lock, flags);
        wbn = acm_wb_alloc(acm);
@@ -689,7 +685,7 @@ static int acm_tty_write(struct tty_struct *tty,
        }
 
        count = (count > acm->writesize) ? acm->writesize : count;
-       dev_vdbg(&acm->data->dev, "%s - write %d\n", __func__, count);
+       dev_vdbg(&acm->data->dev, "writing %d bytes\n", count);
        memcpy(wb->buf, buf, count);
        wb->len = count;
 
-- 
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to