Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e9e75f8 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: cdc-acm: use dev_vdbg in read/write paths 



Replace dev_dbg with verbose dev_vdbg in read/write paths where
appropriate.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4fa4626c

drivers/usb/class/cdc-acm.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -208,7 +208,7 @@ static int acm_write_start(struct acm *acm, int wbn) 
		return -ENODEV;

		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);

							acm->susp_count);

	usb_autopm_get_interface_async(acm->control);

	usb_autopm_get_interface_async(acm->control);

	if (acm->susp_count) {

	if (acm->susp_count) {
@@ -361,7 +361,7 @@ static void acm_read_bulk(struct urb *urb) 
	struct acm *acm = rcv->instance;

	struct acm *acm = rcv->instance;

	int status = urb->status;

	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)) {

	if (!ACM_READY(acm)) {

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

		dev_dbg(&acm->data->dev, "%s - acm not ready\n", __func__);
@@ -404,7 +404,7 @@ static void acm_rx_tasklet(unsigned long _acm) 
	unsigned long flags;

	unsigned long flags;

	unsigned char throttled;

	unsigned char throttled;





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

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





	if (!ACM_READY(acm)) {

	if (!ACM_READY(acm)) {

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

		dev_dbg(&acm->data->dev, "%s - acm not ready\n", __func__);
@@ -432,7 +432,7 @@ static void acm_rx_tasklet(unsigned long _acm) 
	list_del(&buf->list);

	list_del(&buf->list);

	spin_unlock_irqrestore(&acm->read_lock, flags);

	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);

						__func__, buf, buf->size);

	if (tty) {

	if (tty) {

		spin_lock_irqsave(&acm->throttle_lock, flags);

		spin_lock_irqsave(&acm->throttle_lock, flags);
@@ -505,7 +505,7 @@ static void acm_rx_tasklet(unsigned long _acm) 
			return;

			return;

		} else {

		} else {

			spin_unlock_irqrestore(&acm->read_lock, flags);

			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",

				"%s - sending urb 0x%p, rcv 0x%p, buf 0x%p\n",

				__func__, rcv->urb, rcv, buf);

				__func__, rcv->urb, rcv, buf);

		}

		}
@@ -719,7 +719,7 @@ static int acm_tty_write(struct tty_struct *tty, 
	if (!count)

	if (!count)

		return 0;

		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);

	spin_lock_irqsave(&acm->write_lock, flags);

	wbn = acm_wb_alloc(acm);

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

	wb = &acm->wb[wbn];





	count = (count > acm->writesize) ? acm->writesize : count;

	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);

	memcpy(wb->buf, buf, count);

	wb->len = count;

	wb->len = count;

	spin_unlock_irqrestore(&acm->write_lock, flags);

	spin_unlock_irqrestore(&acm->write_lock, flags);