diff options
author | matt mooney <mfm@muteddisk.com> | 2011-05-19 16:47:32 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 16:57:30 -0700 |
commit | 1a4b6f66285785ddccef049e6b45be4e7c7a2189 (patch) | |
tree | fe745a2467162a9ab23ca37ce7872532a69f136d /drivers/staging/usbip/usbip_common.c | |
parent | db60697a086cdf4bbe6deedcefc2ff81e2a9efd2 (diff) |
staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
This switches all of the usbip_u{dbg,err,info} and printk statements to
dev_<level>, if possible, or pr_<level> macros. And removes a few
unnecessary debug statements.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/usbip/usbip_common.c')
-rw-r--r-- | drivers/staging/usbip/usbip_common.c | 230 |
1 files changed, 105 insertions, 125 deletions
diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c index 68f51068abf..433a3b6207d 100644 --- a/drivers/staging/usbip/usbip_common.c +++ b/drivers/staging/usbip/usbip_common.c @@ -56,7 +56,7 @@ DEVICE_ATTR(usbip_debug, (S_IRUGO | S_IWUSR), show_flag, store_flag); static void usbip_dump_buffer(char *buff, int bufflen) { - print_hex_dump(KERN_DEBUG, "usb-ip", DUMP_PREFIX_OFFSET, 16, 4, + print_hex_dump(KERN_DEBUG, "usbip-core", DUMP_PREFIX_OFFSET, 16, 4, buff, bufflen, false); } @@ -67,30 +67,25 @@ static void usbip_dump_pipe(unsigned int p) unsigned char dev = usb_pipedevice(p); unsigned char dir = usb_pipein(p); - printk(KERN_DEBUG "dev(%d) ", dev); - printk(KERN_DEBUG "ep(%d) ", ep); - printk(KERN_DEBUG "%s ", dir ? "IN" : "OUT"); + pr_debug("dev(%d) ep(%d) [%s] ", dev, ep, dir ? "IN" : "OUT"); switch (type) { case PIPE_ISOCHRONOUS: - printk(KERN_DEBUG "%s ", "ISO"); + pr_debug("ISO\n"); break; case PIPE_INTERRUPT: - printk(KERN_DEBUG "%s ", "INT"); + pr_debug("INT\n"); break; case PIPE_CONTROL: - printk(KERN_DEBUG "%s ", "CTL"); + pr_debug("CTRL\n"); break; case PIPE_BULK: - printk(KERN_DEBUG "%s ", "BLK"); + pr_debug("BULK\n"); break; default: - printk(KERN_DEBUG "ERR"); + pr_debug("ERR\n"); break; } - - printk(KERN_DEBUG "\n"); - } static void usbip_dump_usb_device(struct usb_device *udev) @@ -98,61 +93,59 @@ static void usbip_dump_usb_device(struct usb_device *udev) struct device *dev = &udev->dev; int i; - dev_dbg(dev, " devnum(%d) devpath(%s)", + dev_dbg(dev, " devnum(%d) devpath(%s) ", udev->devnum, udev->devpath); switch (udev->speed) { case USB_SPEED_HIGH: - printk(KERN_DEBUG " SPD_HIGH"); + pr_debug("SPD_HIGH "); break; case USB_SPEED_FULL: - printk(KERN_DEBUG " SPD_FULL"); + pr_debug("SPD_FULL "); break; case USB_SPEED_LOW: - printk(KERN_DEBUG " SPD_LOW"); + pr_debug("SPD_LOW "); break; case USB_SPEED_UNKNOWN: - printk(KERN_DEBUG " SPD_UNKNOWN"); + pr_debug("SPD_UNKNOWN "); break; default: - printk(KERN_DEBUG " SPD_ERROR"); + pr_debug("SPD_ERROR "); break; } - printk(KERN_DEBUG " tt %p, ttport %d", udev->tt, udev->ttport); - printk(KERN_DEBUG "\n"); + pr_debug("tt %p, ttport %d\n", udev->tt, udev->ttport); dev_dbg(dev, " "); for (i = 0; i < 16; i++) - printk(KERN_DEBUG " %2u", i); - printk(KERN_DEBUG "\n"); + pr_debug(" %2u", i); + pr_debug("\n"); dev_dbg(dev, " toggle0(IN) :"); for (i = 0; i < 16; i++) - printk(KERN_DEBUG " %2u", (udev->toggle[0] & (1 << i)) ? 1 : 0); - printk(KERN_DEBUG "\n"); + pr_debug(" %2u", (udev->toggle[0] & (1 << i)) ? 1 : 0); + pr_debug("\n"); dev_dbg(dev, " toggle1(OUT):"); for (i = 0; i < 16; i++) - printk(KERN_DEBUG " %2u", (udev->toggle[1] & (1 << i)) ? 1 : 0); - printk(KERN_DEBUG "\n"); - + pr_debug(" %2u", (udev->toggle[1] & (1 << i)) ? 1 : 0); + pr_debug("\n"); dev_dbg(dev, " epmaxp_in :"); for (i = 0; i < 16; i++) { if (udev->ep_in[i]) - printk(KERN_DEBUG " %2u", - le16_to_cpu(udev->ep_in[i]->desc.wMaxPacketSize)); + pr_debug(" %2u", + le16_to_cpu(udev->ep_in[i]->desc.wMaxPacketSize)); } - printk(KERN_DEBUG "\n"); + pr_debug("\n"); dev_dbg(dev, " epmaxp_out :"); for (i = 0; i < 16; i++) { if (udev->ep_out[i]) - printk(KERN_DEBUG " %2u", - le16_to_cpu(udev->ep_out[i]->desc.wMaxPacketSize)); + pr_debug(" %2u", + le16_to_cpu(udev->ep_out[i]->desc.wMaxPacketSize)); } - printk(KERN_DEBUG "\n"); + pr_debug("\n"); dev_dbg(dev, "parent %p, bus %p\n", udev->parent, udev->bus); @@ -171,19 +164,19 @@ static void usbip_dump_request_type(__u8 rt) { switch (rt & USB_RECIP_MASK) { case USB_RECIP_DEVICE: - printk(KERN_DEBUG "DEVICE"); + pr_debug("DEVICE"); break; case USB_RECIP_INTERFACE: - printk(KERN_DEBUG "INTERF"); + pr_debug("INTERF"); break; case USB_RECIP_ENDPOINT: - printk(KERN_DEBUG "ENDPOI"); + pr_debug("ENDPOI"); break; case USB_RECIP_OTHER: - printk(KERN_DEBUG "OTHER "); + pr_debug("OTHER "); break; default: - printk(KERN_DEBUG "------"); + pr_debug("------"); break; } } @@ -191,73 +184,64 @@ static void usbip_dump_request_type(__u8 rt) static void usbip_dump_usb_ctrlrequest(struct usb_ctrlrequest *cmd) { if (!cmd) { - printk(KERN_DEBUG " %s : null pointer\n", __func__); + pr_debug(" : null pointer\n"); return; } - printk(KERN_DEBUG " "); - printk(KERN_DEBUG "bRequestType(%02X) ", cmd->bRequestType); - printk(KERN_DEBUG "bRequest(%02X) " , cmd->bRequest); - printk(KERN_DEBUG "wValue(%04X) ", cmd->wValue); - printk(KERN_DEBUG "wIndex(%04X) ", cmd->wIndex); - printk(KERN_DEBUG "wLength(%04X) ", cmd->wLength); - - printk(KERN_DEBUG "\n "); + pr_debug(" "); + pr_debug("bRequestType(%02X) bRequest(%02X) wValue(%04X) wIndex(%04X) " + "wLength(%04X) ", cmd->bRequestType, cmd->bRequest, + cmd->wValue, cmd->wIndex, cmd->wLength); + pr_debug("\n "); if ((cmd->bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD) { - printk(KERN_DEBUG "STANDARD "); + pr_debug("STANDARD "); switch (cmd->bRequest) { case USB_REQ_GET_STATUS: - printk(KERN_DEBUG "GET_STATUS"); + pr_debug("GET_STATUS\n"); break; case USB_REQ_CLEAR_FEATURE: - printk(KERN_DEBUG "CLEAR_FEAT"); + pr_debug("CLEAR_FEAT\n"); break; case USB_REQ_SET_FEATURE: - printk(KERN_DEBUG "SET_FEAT "); + pr_debug("SET_FEAT \n"); break; case USB_REQ_SET_ADDRESS: - printk(KERN_DEBUG "SET_ADDRRS"); + pr_debug("SET_ADDRRS\n"); break; case USB_REQ_GET_DESCRIPTOR: - printk(KERN_DEBUG "GET_DESCRI"); + pr_debug("GET_DESCRI\n"); break; case USB_REQ_SET_DESCRIPTOR: - printk(KERN_DEBUG "SET_DESCRI"); + pr_debug("SET_DESCRI\n"); break; case USB_REQ_GET_CONFIGURATION: - printk(KERN_DEBUG "GET_CONFIG"); + pr_debug("GET_CONFIG\n"); break; case USB_REQ_SET_CONFIGURATION: - printk(KERN_DEBUG "SET_CONFIG"); + pr_debug("SET_CONFIG\n"); break; case USB_REQ_GET_INTERFACE: - printk(KERN_DEBUG "GET_INTERF"); + pr_debug("GET_INTERF\n"); break; case USB_REQ_SET_INTERFACE: - printk(KERN_DEBUG "SET_INTERF"); + pr_debug("SET_INTERF\n"); break; case USB_REQ_SYNCH_FRAME: - printk(KERN_DEBUG "SYNC_FRAME"); + pr_debug("SYNC_FRAME\n"); break; default: - printk(KERN_DEBUG "REQ(%02X) ", cmd->bRequest); + pr_debug("REQ(%02X) \n", cmd->bRequest); break; } - - printk(KERN_DEBUG " "); usbip_dump_request_type(cmd->bRequestType); - - } else if ((cmd->bRequestType & USB_TYPE_MASK) == USB_TYPE_CLASS) - printk(KERN_DEBUG "CLASS "); - - else if ((cmd->bRequestType & USB_TYPE_MASK) == USB_TYPE_VENDOR) - printk(KERN_DEBUG "VENDOR "); - - else if ((cmd->bRequestType & USB_TYPE_MASK) == USB_TYPE_RESERVED) - printk(KERN_DEBUG "RESERVED"); - - printk(KERN_DEBUG "\n"); + } else if ((cmd->bRequestType & USB_TYPE_MASK) == USB_TYPE_CLASS) { + pr_debug("CLASS \n"); + } else if ((cmd->bRequestType & USB_TYPE_MASK) == USB_TYPE_VENDOR) { + pr_debug("VENDOR \n"); + } else if ((cmd->bRequestType & USB_TYPE_MASK) == USB_TYPE_RESERVED) { + pr_debug("RESERVED\n"); + } } void usbip_dump_urb(struct urb *urb) @@ -265,16 +249,15 @@ void usbip_dump_urb(struct urb *urb) struct device *dev; if (!urb) { - printk(KERN_DEBUG KBUILD_MODNAME - ":%s: urb: null pointer!!\n", __func__); + pr_debug("urb: null pointer!!\n"); return; } if (!urb->dev) { - printk(KERN_DEBUG KBUILD_MODNAME - ":%s: urb->dev: null pointer!!\n", __func__); + pr_debug("urb->dev: null pointer!!\n"); return; } + dev = &urb->dev->dev; dev_dbg(dev, " urb :%p\n", urb); @@ -309,39 +292,42 @@ EXPORT_SYMBOL_GPL(usbip_dump_urb); void usbip_dump_header(struct usbip_header *pdu) { - usbip_udbg("BASE: cmd %u seq %u devid %u dir %u ep %u\n", - pdu->base.command, - pdu->base.seqnum, - pdu->base.devid, - pdu->base.direction, - pdu->base.ep); + pr_debug("BASE: cmd %u seq %u devid %u dir %u ep %u\n", + pdu->base.command, + pdu->base.seqnum, + pdu->base.devid, + pdu->base.direction, + pdu->base.ep); switch (pdu->base.command) { case USBIP_CMD_SUBMIT: - usbip_udbg("CMD_SUBMIT: " - "x_flags %u x_len %u sf %u #p %u iv %u\n", - pdu->u.cmd_submit.transfer_flags, - pdu->u.cmd_submit.transfer_buffer_length, - pdu->u.cmd_submit.start_frame, - pdu->u.cmd_submit.number_of_packets, - pdu->u.cmd_submit.interval); + pr_debug("USBIP_CMD_SUBMIT: " + "x_flags %u x_len %u sf %u #p %d iv %d\n", + pdu->u.cmd_submit.transfer_flags, + pdu->u.cmd_submit.transfer_buffer_length, + pdu->u.cmd_submit.start_frame, + pdu->u.cmd_submit.number_of_packets, + pdu->u.cmd_submit.interval); break; case USBIP_CMD_UNLINK: - usbip_udbg("CMD_UNLINK: seq %u\n", pdu->u.cmd_unlink.seqnum); + pr_debug("USBIP_CMD_UNLINK: seq %u\n", + pdu->u.cmd_unlink.seqnum); break; case USBIP_RET_SUBMIT: - usbip_udbg("RET_SUBMIT: st %d al %u sf %d #p %d ec %d\n", - pdu->u.ret_submit.status, - pdu->u.ret_submit.actual_length, - pdu->u.ret_submit.start_frame, - pdu->u.ret_submit.number_of_packets, - pdu->u.ret_submit.error_count); + pr_debug("USBIP_RET_SUBMIT: st %d al %u sf %d #p %d ec %d\n", + pdu->u.ret_submit.status, + pdu->u.ret_submit.actual_length, + pdu->u.ret_submit.start_frame, + pdu->u.ret_submit.number_of_packets, + pdu->u.ret_submit.error_count); + break; case USBIP_RET_UNLINK: - usbip_udbg("RET_UNLINK: status %d\n", pdu->u.ret_unlink.status); + pr_debug("USBIP_RET_UNLINK: status %d\n", + pdu->u.ret_unlink.status); break; default: /* NOT REACHED */ - usbip_udbg("unknown command\n"); + pr_err("unknown command\n"); break; } } @@ -363,21 +349,20 @@ int usbip_xmit(int send, struct socket *sock, char *buf, usbip_dbg_xmit("enter\n"); if (!sock || !buf || !size) { - printk(KERN_ERR "%s: invalid arg, sock %p buff %p size %d\n", - __func__, sock, buf, size); + pr_err("invalid arg, sock %p buff %p size %d\n", sock, buf, + size); return -EINVAL; } if (usbip_dbg_flag_xmit) { if (send) { if (!in_interrupt()) - printk(KERN_DEBUG "%-10s:", current->comm); + pr_debug("%-10s:", current->comm); else - printk(KERN_DEBUG "interrupt :"); + pr_debug("interrupt :"); - printk(KERN_DEBUG "%s: sending... , sock %p, buf %p, " - "size %d, msg_flags %d\n", __func__, - sock, buf, size, msg_flags); + pr_debug("sending... , sock %p, buf %p, size %d, " + "msg_flags %d\n", sock, buf, size, msg_flags); usbip_dump_buffer(buf, size); } } @@ -400,9 +385,9 @@ int usbip_xmit(int send, struct socket *sock, char *buf, MSG_WAITALL); if (result <= 0) { - usbip_udbg("usbip_xmit: %s sock %p buf %p size %u ret " - "%d total %d\n", send ? "send" : "receive", - sock, buf, size, result, total); + pr_debug("%s sock %p buf %p size %u ret %d total %d\n", + send ? "send" : "receive", sock, buf, size, + result, total); goto err; } @@ -415,20 +400,18 @@ int usbip_xmit(int send, struct socket *sock, char *buf, if (usbip_dbg_flag_xmit) { if (!send) { if (!in_interrupt()) - printk(KERN_DEBUG "%-10s:", current->comm); + pr_debug("%-10s:", current->comm); else - printk(KERN_DEBUG "interrupt :"); + pr_debug("interrupt :"); - printk(KERN_DEBUG "usbip_xmit: receiving....\n"); + pr_debug("receiving....\n"); usbip_dump_buffer(bp, osize); - printk(KERN_DEBUG "usbip_xmit: received, osize %d ret " - "%d size %d total %d\n", osize, result, size, - total); + pr_debug("received, osize %d ret %d size %d total %d\n", + osize, result, size, total); } if (send) - printk(KERN_DEBUG "usbip_xmit: send, total %d\n", - total); + pr_debug("send, total %d\n", total); } return total; @@ -446,7 +429,7 @@ struct socket *sockfd_to_socket(unsigned int sockfd) file = fget(sockfd); if (!file) { - printk(KERN_ERR "%s: invalid sockfd\n", __func__); + pr_err("invalid sockfd\n"); return NULL; } @@ -532,8 +515,7 @@ void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd, break; default: /* NOT REACHED */ - err("unknown command"); - /* BUG(); */ + pr_err("unknown command\n"); break; } } @@ -639,8 +621,7 @@ void usbip_header_correct_endian(struct usbip_header *pdu, int send) break; default: /* NOT REACHED */ - err("unknown command in pdu header: %d", cmd); - /* BUG(); */ + pr_err("unknown command\n"); break; } } @@ -722,7 +703,7 @@ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb) /* my Bluetooth dongle gets ISO URBs which are np = 0 */ if (np == 0) { - /* usbip_uinfo("iso np == 0\n"); */ + /* pr_info("iso np == 0\n"); */ /* usbip_dump_urb(urb); */ return 0; } @@ -860,8 +841,7 @@ EXPORT_SYMBOL_GPL(usbip_recv_xbuff); static int __init usbip_common_init(void) { - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " " USBIP_VERSION - "\n"); + pr_info(DRIVER_DESC " v" USBIP_VERSION "\n"); return 0; } |