From d777980a61e643e24b75574cceeaf7b0382c70f9 Mon Sep 17 00:00:00 2001 From: David Kilroy Date: Wed, 9 Dec 2009 19:28:05 +0000 Subject: [PATCH] Revert "Fix compile on v2.6.29" This reverts commit 43ccc0eb07b6634839fa626d1d0d75ce0a11af46. --- drivers/net/wireless/orinoco_usb.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/orinoco_usb.c b/drivers/net/wireless/orinoco_usb.c index 8a603b9..70a41cf 100644 --- a/drivers/net/wireless/orinoco_usb.c +++ b/drivers/net/wireless/orinoco_usb.c @@ -565,7 +565,7 @@ static void ezusb_request_out_callback(struct urb *urb) if (ctx->killed) { spin_unlock_irqrestore(&upriv->req_lock, flags); - pr_warning("interrupt called with dead ctx"); + warn("interrupt called with dead ctx"); goto out; } @@ -702,7 +702,7 @@ static void ezusb_request_in_callback(struct ezusb_priv *upriv, default: spin_unlock_irqrestore(&upriv->req_lock, flags); - pr_warning("Matched IN URB, unexpected context state(0x%x)", + warn("Matched IN URB, unexpected context state(0x%x)", state); /* Throw this CTX away and try submitting another */ del_timer(&ctx->timer); @@ -1298,11 +1298,11 @@ static void ezusb_bulk_in_callback(struct urb *urb) /* When a device gets unplugged we get this every time * we resubmit, flooding the logs. Since we don't use * USB timeouts, it shouldn't happen any other time*/ - pr_warning("%s: urb timed out, not resubmiting", __FUNCTION__); + warn("%s: urb timed out, not resubmiting", __FUNCTION__); return; } if (urb->status == -ECONNABORTED) { - pr_warning("%s: connection abort, resubmiting urb", + warn("%s: connection abort, resubmiting urb", __FUNCTION__); goto resubmit; } @@ -1474,7 +1474,7 @@ static int ezusb_probe(struct usb_interface *interface, == USB_ENDPOINT_XFER_BULK)) { /* we found a bulk in endpoint */ if (upriv->read_urb != NULL) { - pr_warning("Found a second bulk in ep, ignored"); + warn("Found a second bulk in ep, ignored"); continue; } @@ -1484,9 +1484,9 @@ static int ezusb_probe(struct usb_interface *interface, goto error; } if (le16_to_cpu(ep->wMaxPacketSize) != 64) - pr_warning("bulk in: wMaxPacketSize!= 64"); + warn("bulk in: wMaxPacketSize!= 64"); if (ep->bEndpointAddress != (2 | USB_DIR_IN)) - pr_warning("bulk in: bEndpointAddress: %d", + warn("bulk in: bEndpointAddress: %d", ep->bEndpointAddress); upriv->read_pipe = usb_rcvbulkpipe(udev, ep-> @@ -1505,14 +1505,14 @@ static int ezusb_probe(struct usb_interface *interface, == USB_ENDPOINT_XFER_BULK)) { /* we found a bulk out endpoint */ if (upriv->bap_buf != NULL) { - pr_warning("Found a second bulk out ep, ignored"); + warn("Found a second bulk out ep, ignored"); continue; } if (le16_to_cpu(ep->wMaxPacketSize) != 64) - pr_warning("bulk out: wMaxPacketSize != 64"); + warn("bulk out: wMaxPacketSize != 64"); if (ep->bEndpointAddress != 2) - pr_warning("bulk out: bEndpointAddress: %d", + warn("bulk out: bEndpointAddress: %d", ep->bEndpointAddress); upriv->write_pipe = usb_sndbulkpipe(udev, ep-> -- 2.11.4.GIT