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

Commit 34ad569f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: atm: usbatm: fix up debug printing code 



If VERBOSE_DEBUG was enabled, lots of build errors happend (obviously no
one uses this mode.)  So fix that up, and get rid of the dbg() call, and
use dev_dbg() like the rest of the driver does.

Cc: Duncan Sands <duncan.sands@free.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 799ee924

drivers/usb/atm/usbatm.c

+28 −18
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 
#include <linux/ratelimit.h>



#ifdef VERBOSE_DEBUG

static int usbatm_print_packet(const unsigned char *data, int len);

static int usbatm_print_packet(struct usbatm_data *instance, const unsigned char *data, int len);

#define PACKETDEBUG(arg...)	usbatm_print_packet(arg)

#define vdbg(arg...)		dev_dbg(arg)

#else
@@ -230,8 +230,8 @@ static int usbatm_submit_urb(struct urb *urb) 
	struct usbatm_channel *channel = urb->context;

	int ret;



	vdbg("%s: submitting urb 0x%p, size %u",

	     __func__, urb, urb->transfer_buffer_length);

	/* vdbg("%s: submitting urb 0x%p, size %u",

	     __func__, urb, urb->transfer_buffer_length); */



	ret = usb_submit_urb(urb, GFP_ATOMIC);

	if (ret) {
@@ -261,8 +261,8 @@ static void usbatm_complete(struct urb *urb) 
	unsigned long flags;

	int status = urb->status;



	vdbg("%s: urb 0x%p, status %d, actual_length %d",

	     __func__, urb, status, urb->actual_length);

	/* vdbg("%s: urb 0x%p, status %d, actual_length %d",

	     __func__, urb, status, urb->actual_length); */



	/* usually in_interrupt(), but not always */

	spin_lock_irqsave(&channel->lock, flags);
@@ -311,7 +311,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char 
	int vci = ((source[1] & 0x0f) << 12) | (source[2] << 4) | (source[3] >> 4);

	u8 pti = ((source[3] & 0xe) >> 1);



	vdbg("%s: vpi %hd, vci %d, pti %d", __func__, vpi, vci, pti);

	vdbg(&instance->usb_intf->dev, "%s: vpi %hd, vci %d, pti %d", __func__, vpi, vci, pti);



	if ((vci != instance->cached_vci) || (vpi != instance->cached_vpi)) {

		instance->cached_vpi = vpi;
@@ -381,7 +381,9 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char 
			goto out;

		}



		vdbg("%s: got packet (length: %u, pdu_length: %u, vcc: 0x%p)", __func__, length, pdu_length, vcc);

		vdbg(&instance->usb_intf->dev,

		     "%s: got packet (length: %u, pdu_length: %u, vcc: 0x%p)",

		     __func__, length, pdu_length, vcc);



		if (!(skb = dev_alloc_skb(length))) {

			if (printk_ratelimit())
@@ -391,7 +393,9 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char 
			goto out;

		}



		vdbg("%s: allocated new sk_buff (skb: 0x%p, skb->truesize: %u)", __func__, skb, skb->truesize);

		vdbg(&instance->usb_intf->dev,

		     "%s: allocated new sk_buff (skb: 0x%p, skb->truesize: %u)",

		     __func__, skb, skb->truesize);



		if (!atm_charge(vcc, skb->truesize)) {

			atm_rldbg(instance, "%s: failed atm_charge (skb->truesize: %u)!\n",
@@ -405,10 +409,11 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char 
					length);

		__skb_put(skb, length);



		vdbg("%s: sending skb 0x%p, skb->len %u, skb->truesize %u",

		vdbg(&instance->usb_intf->dev,

		     "%s: sending skb 0x%p, skb->len %u, skb->truesize %u",

		     __func__, skb, skb->len, skb->truesize);



		PACKETDEBUG(skb->data, skb->len);

		PACKETDEBUG(instance, skb->data, skb->len);



		vcc->push(vcc, skb);
@@ -474,7 +479,8 @@ static unsigned int usbatm_write_cells(struct usbatm_data *instance, 
	unsigned int bytes_written;

	unsigned int stride = instance->tx_channel.stride;



	vdbg("%s: skb->len=%d, avail_space=%u", __func__, skb->len, avail_space);

	vdbg(&instance->usb_intf->dev, "%s: skb->len=%d, avail_space=%u",

	     __func__, skb->len, avail_space);

	UDSL_ASSERT(instance, !(avail_space % stride));



	for (bytes_written = 0; bytes_written < avail_space && ctrl->len;
@@ -534,7 +540,8 @@ static void usbatm_rx_process(unsigned long data) 
	struct urb *urb;



	while ((urb = usbatm_pop_urb(&instance->rx_channel))) {

		vdbg("%s: processing urb 0x%p", __func__, urb);

		vdbg(&instance->usb_intf->dev,

		     "%s: processing urb 0x%p", __func__, urb);



		if (usb_pipeisoc(urb->pipe)) {

			unsigned char *merge_start = NULL;
@@ -608,7 +615,8 @@ static void usbatm_tx_process(unsigned long data) 
						  buffer + bytes_written,

						  buf_size - bytes_written);



		vdbg("%s: wrote %u bytes from skb 0x%p to urb 0x%p",

		vdbg(&instance->usb_intf->dev,

		     "%s: wrote %u bytes from skb 0x%p to urb 0x%p",

		     __func__, bytes_written, skb, urb);



		if (!UDSL_SKB(skb)->len) {
@@ -664,7 +672,8 @@ static int usbatm_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) 
	struct usbatm_control *ctrl = UDSL_SKB(skb);

	int err;



	vdbg("%s called (skb 0x%p, len %u)", __func__, skb, skb->len);

	vdbg(&instance->usb_intf->dev, "%s called (skb 0x%p, len %u)", __func__,

	     skb, skb->len);



	/* racy disconnection check - fine */

	if (!instance || instance->disconnected) {
@@ -688,7 +697,7 @@ static int usbatm_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) 
		goto fail;

	}



	PACKETDEBUG(skb->data, skb->len);

	PACKETDEBUG(instance, skb->data, skb->len);



	/* initialize the control block */

	ctrl->atm.vcc = vcc;
@@ -1202,7 +1211,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id, 
		if (i >= num_rcv_urbs)

			list_add_tail(&urb->urb_list, &channel->list);



		vdbg("%s: alloced buffer 0x%p buf size %u urb 0x%p",

		vdbg(&intf->dev, "%s: alloced buffer 0x%p buf size %u urb 0x%p",

		     __func__, urb->transfer_buffer, urb->transfer_buffer_length, urb);

	}
@@ -1359,7 +1368,8 @@ MODULE_VERSION(DRIVER_VERSION); 
************/



#ifdef VERBOSE_DEBUG

static int usbatm_print_packet(const unsigned char *data, int len)

static int usbatm_print_packet(struct usbatm_data *instance,

			       const unsigned char *data, int len)

{

	unsigned char buffer[256];

	int i = 0, j = 0;
@@ -1369,7 +1379,7 @@ static int usbatm_print_packet(const unsigned char *data, int len) 
		sprintf(buffer, "%.3d :", i);

		for (j = 0; (j < 16) && (i < len); j++, i++)

			sprintf(buffer, "%s %2.2x", buffer, data[i]);

		dbg("%s", buffer);

		dev_dbg(&instance->usb_intf->dev, "%s", buffer);

	}

	return i;

}