Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248699
b: refs/heads/master
c: 5e9e75f
h: refs/heads/master
i:
  248697: abc5430
  248695: c6fd3d1
v: v3
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Apr 13, 2011
1 parent bf4d151 commit 84280c3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4fa4626cd43679dc62a73ee3e347665e761abc9c
refs/heads/master: 5e9e75f8bd97864d552ec2b8d1a00e2b3012a6b3
14 changes: 7 additions & 7 deletions trunk/drivers/usb/class/cdc-acm.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ static int acm_write_start(struct acm *acm, int wbn)
return -ENODEV;
}

dev_dbg(&acm->data->dev, "%s - susp_count %d\n", __func__,
dev_vdbg(&acm->data->dev, "%s - susp_count %d\n", __func__,
acm->susp_count);
usb_autopm_get_interface_async(acm->control);
if (acm->susp_count) {
Expand Down Expand Up @@ -361,7 +361,7 @@ static void acm_read_bulk(struct urb *urb)
struct acm *acm = rcv->instance;
int status = urb->status;

dev_dbg(&acm->data->dev, "%s - status %d\n", __func__, status);
dev_vdbg(&acm->data->dev, "%s - status %d\n", __func__, status);

if (!ACM_READY(acm)) {
dev_dbg(&acm->data->dev, "%s - acm not ready\n", __func__);
Expand Down Expand Up @@ -404,7 +404,7 @@ static void acm_rx_tasklet(unsigned long _acm)
unsigned long flags;
unsigned char throttled;

dev_dbg(&acm->data->dev, "%s\n", __func__);
dev_vdbg(&acm->data->dev, "%s\n", __func__);

if (!ACM_READY(acm)) {
dev_dbg(&acm->data->dev, "%s - acm not ready\n", __func__);
Expand Down Expand Up @@ -432,7 +432,7 @@ static void acm_rx_tasklet(unsigned long _acm)
list_del(&buf->list);
spin_unlock_irqrestore(&acm->read_lock, flags);

dev_dbg(&acm->data->dev, "%s - processing buf 0x%p, size = %d\n",
dev_vdbg(&acm->data->dev, "%s - processing buf 0x%p, size = %d\n",
__func__, buf, buf->size);
if (tty) {
spin_lock_irqsave(&acm->throttle_lock, flags);
Expand Down Expand Up @@ -505,7 +505,7 @@ static void acm_rx_tasklet(unsigned long _acm)
return;
} else {
spin_unlock_irqrestore(&acm->read_lock, flags);
dev_dbg(&acm->data->dev,
dev_vdbg(&acm->data->dev,
"%s - sending urb 0x%p, rcv 0x%p, buf 0x%p\n",
__func__, rcv->urb, rcv, buf);
}
Expand Down Expand Up @@ -719,7 +719,7 @@ static int acm_tty_write(struct tty_struct *tty,
if (!count)
return 0;

dev_dbg(&acm->data->dev, "%s - count %d\n", __func__, count);
dev_vdbg(&acm->data->dev, "%s - count %d\n", __func__, count);

spin_lock_irqsave(&acm->write_lock, flags);
wbn = acm_wb_alloc(acm);
Expand All @@ -730,7 +730,7 @@ static int acm_tty_write(struct tty_struct *tty,
wb = &acm->wb[wbn];

count = (count > acm->writesize) ? acm->writesize : count;
dev_dbg(&acm->data->dev, "%s - write %d\n", __func__, count);
dev_vdbg(&acm->data->dev, "%s - write %d\n", __func__, count);
memcpy(wb->buf, buf, count);
wb->len = count;
spin_unlock_irqrestore(&acm->write_lock, flags);
Expand Down

0 comments on commit 84280c3

Please sign in to comment.