Commit 1a4b6f66 authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman
Browse files

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: default avatarmatt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent db60697a

drivers/staging/usbip/stub_dev.c

+20 −24
Original line number Diff line number Diff line
@@ -196,7 +196,8 @@ static void stub_shutdown_connection(struct usbip_device *ud) 
	 * step 1?

	 */

	if (ud->tcp_socket) {

		usbip_udbg("shutdown tcp_socket %p\n", ud->tcp_socket);

		dev_dbg(&sdev->udev->dev, "shutdown tcp_socket %p\n",

			ud->tcp_socket);

		kernel_sock_shutdown(ud->tcp_socket, SHUT_RDWR);

	}
@@ -244,12 +245,11 @@ static void stub_device_reset(struct usbip_device *ud) 
	struct usb_device *udev = sdev->udev;

	int ret;



	usbip_udbg("device reset");

	dev_dbg(&udev->dev, "device reset");



	ret = usb_lock_device_for_reset(udev, sdev->interface);

	if (ret < 0) {

		dev_err(&udev->dev, "lock for reset\n");



		spin_lock(&ud->lock);

		ud->status = SDEV_ST_ERROR;

		spin_unlock(&ud->lock);
@@ -336,7 +336,8 @@ static struct stub_device *stub_device_alloc(struct usb_device *udev, 


	usbip_start_eh(&sdev->ud);



	usbip_udbg("register new interface\n");

	dev_dbg(&interface->dev, "register new interface\n");



	return sdev;

}
@@ -346,7 +347,7 @@ static int stub_device_free(struct stub_device *sdev) 
		return -EINVAL;



	kfree(sdev);

	usbip_udbg("kfree udev ok\n");

	pr_debug("kfree udev ok\n");



	return 0;

}
@@ -376,9 +377,8 @@ static int stub_probe(struct usb_interface *interface, 
	busid_priv = get_busid_priv(udev_busid);

	if (!busid_priv  || (busid_priv->status == STUB_BUSID_REMOV) ||

	    (busid_priv->status == STUB_BUSID_OTHER)) {

		dev_info(&interface->dev,

			 "this device %s is not in match_busid table. skip!\n",

			 udev_busid);

		dev_info(&interface->dev, "%s is not in match_busid table... "

			 "skip!\n", udev_busid);



		/*

		 * Return value should be ENODEV or ENOXIO to continue trying
@@ -389,13 +389,13 @@ static int stub_probe(struct usb_interface *interface, 
	}



	if (udev->descriptor.bDeviceClass == USB_CLASS_HUB) {

		usbip_udbg("this device %s is a usb hub device. skip!\n",

		dev_dbg(&udev->dev, "%s is a usb hub device... skip!\n",

			 udev_busid);

		return -ENODEV;

	}



	if (!strcmp(udev->bus->bus_name, "vhci_hcd")) {

		usbip_udbg("this device %s is attached on vhci_hcd. skip!\n",

		dev_dbg(&udev->dev, "%s is attached on vhci_hcd... skip!\n",

			 udev_busid);

		return -ENODEV;

	}
@@ -406,8 +406,7 @@ static int stub_probe(struct usb_interface *interface, 
			return -ENODEV;



		busid_priv->interf_count++;

		dev_info(&interface->dev,

			 "USB/IP Stub: register a new interface "

		dev_info(&interface->dev, "usbip-host: register new interface "

			 "(bus %u dev %u ifn %u)\n",

			 udev->bus->busnum, udev->devnum,

			 interface->cur_altsetting->desc.bInterfaceNumber);
@@ -417,7 +416,7 @@ static int stub_probe(struct usb_interface *interface, 


		err = stub_add_files(&interface->dev);

		if (err) {

			dev_err(&interface->dev, "create sysfs files for %s\n",

			dev_err(&interface->dev, "stub_add_files for %s\n",

				udev_busid);

			usb_set_intfdata(interface, NULL);

			busid_priv->interf_count--;
@@ -434,7 +433,7 @@ static int stub_probe(struct usb_interface *interface, 
	if (!sdev)

		return -ENOMEM;



	dev_info(&interface->dev, "USB/IP Stub: register a new device "

	dev_info(&interface->dev, "usbip-host: register new device "

		 "(bus %u dev %u ifn %u)\n", udev->bus->busnum, udev->devnum,

		 interface->cur_altsetting->desc.bInterfaceNumber);
@@ -449,8 +448,7 @@ static int stub_probe(struct usb_interface *interface, 


	err = stub_add_files(&interface->dev);

	if (err) {

		dev_err(&interface->dev, "create sysfs files for %s\n",

			udev_busid);

		dev_err(&interface->dev, "stub_add_files for %s\n", udev_busid);

		usb_set_intfdata(interface, NULL);

		usb_put_intf(interface);
@@ -486,10 +484,9 @@ static void stub_disconnect(struct usb_interface *interface) 
	const char *udev_busid = dev_name(interface->dev.parent);

	struct bus_id_priv *busid_priv;



	busid_priv = get_busid_priv(udev_busid);



	usbip_udbg("Enter\n");

	dev_dbg(&interface->dev, "Enter\n");



	busid_priv = get_busid_priv(udev_busid);

	if (!busid_priv) {

		BUG();

		return;
@@ -499,7 +496,7 @@ static void stub_disconnect(struct usb_interface *interface) 


	/* get stub_device */

	if (!sdev) {

		err(" could not get device from inteface data");

		dev_err(&interface->dev, "could not get device");

		/* BUG(); */

		return;

	}
@@ -543,5 +540,4 @@ static void stub_disconnect(struct usb_interface *interface) 
		busid_priv->status = STUB_BUSID_OTHER;

		del_match_busid((char *)udev_busid);

	}

	usbip_udbg("bye\n");

}

drivers/staging/usbip/stub_main.c

+8 −11
Original line number Diff line number Diff line
@@ -178,14 +178,14 @@ static ssize_t store_match_busid(struct device_driver *dev, const char *buf, 
		if (add_match_busid(busid) < 0)

			return -ENOMEM;

		else {

			usbip_udbg("add busid %s\n", busid);

			pr_debug("add busid %s\n", busid);

			return count;

		}

	} else if (!strncmp(buf, "del ", 4)) {

		if (del_match_busid(busid) < 0)

			return -ENODEV;

		else {

			usbip_udbg("del busid %s\n", busid);

			pr_debug("del busid %s\n", busid);

			return count;

		}

	} else
@@ -239,12 +239,12 @@ void stub_device_cleanup_urbs(struct stub_device *sdev) 
{

	struct stub_priv *priv;



	usbip_udbg("free sdev %p\n", sdev);

	dev_dbg(&sdev->udev->dev, "free sdev %p\n", sdev);



	while ((priv = stub_priv_pop(sdev))) {

		struct urb *urb = priv->urb;



		usbip_udbg("   free urb %p\n", urb);

		dev_dbg(&sdev->udev->dev, "free urb %p\n", urb);

		usb_kill_urb(urb);



		kmem_cache_free(stub_priv_cache, priv);
@@ -265,20 +265,17 @@ static int __init usb_stub_init(void) 
					    SLAB_HWCACHE_ALIGN, NULL);



	if (!stub_priv_cache) {

		printk(KERN_ERR KBUILD_MODNAME

		       ": create stub_priv_cache error\n");

		pr_err("create stub_priv_cache error\n");

		return -ENOMEM;

	}



	ret = usb_register(&stub_driver);

	if (ret) {

		printk(KERN_ERR KBUILD_MODNAME ": usb_register failed %d\n",

		       ret);

		pr_err("usb_register failed %d\n", ret);

		goto error_usb_register;

	}



	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " " USBIP_VERSION

	       "\n");

	pr_info(DRIVER_DESC " " USBIP_VERSION "\n");



	init_busid_table();
@@ -286,7 +283,7 @@ static int __init usb_stub_init(void) 
				 &driver_attr_match_busid);



	if (ret) {

		printk(KERN_ERR KBUILD_MODNAME ": create driver sysfs\n");

		pr_err("create driver sysfs\n");

		goto error_create_file;

	}

drivers/staging/usbip/stub_rx.c

+11 −12
Original line number Diff line number Diff line
@@ -102,11 +102,11 @@ static int tweak_clear_halt_cmd(struct urb *urb) 


	ret = usb_clear_halt(urb->dev, target_pipe);

	if (ret < 0)

		usbip_uinfo("clear_halt error: devnum %d endp %d, %d\n",

			    urb->dev->devnum, target_endp, ret);

		dev_err(&urb->dev->dev, "usb_clear_halt error: devnum %d endp "

			"%d ret %d\n", urb->dev->devnum, target_endp, ret);

	else

		usbip_uinfo("clear_halt done: devnum %d endp %d\n",

			    urb->dev->devnum, target_endp);

		dev_info(&urb->dev->dev, "usb_clear_halt done: devnum %d endp "

			 "%d\n", urb->dev->devnum, target_endp);



	return ret;

}
@@ -127,11 +127,11 @@ static int tweak_set_interface_cmd(struct urb *urb) 


	ret = usb_set_interface(urb->dev, interface, alternate);

	if (ret < 0)

		usbip_uinfo("set_interface error: inf %u alt %u, %d\n",

			    interface, alternate, ret);

		dev_err(&urb->dev->dev, "usb_set_interface error: inf %u alt "

			"%u ret %d\n", interface, alternate, ret);

	else

		usbip_uinfo("set_interface done: inf %u alt %u\n",

			    interface, alternate);

		dev_info(&urb->dev->dev, "usb_set_interface done: inf %u alt "

			 "%u\n", interface, alternate);



	return ret;

}
@@ -160,9 +160,8 @@ static int tweak_set_configuration_cmd(struct urb *urb) 
	 * A user may need to set a special configuration value before

	 * exporting the device.

	 */

	usbip_uinfo("set_configuration %d to %s\n",

	dev_info(&urb->dev->dev, "usb_set_configuration %d to %s... skip!\n",

		 config, dev_name(&urb->dev->dev));

	usbip_uinfo("but, skip!\n");



	return 0;

	/* return usb_driver_set_configuration(urb->dev, config); */
@@ -173,7 +172,7 @@ static int tweak_reset_device_cmd(struct urb *urb) 
	struct stub_priv *priv = (struct stub_priv *) urb->context;

	struct stub_device *sdev = priv->sdev;



	usbip_uinfo("reset_device %s\n", dev_name(&urb->dev->dev));

	dev_info(&urb->dev->dev, "usb_queue_reset_device\n");



	/*

	 * usb_lock_device_for_reset caused a deadlock: it causes the driver

drivers/staging/usbip/stub_tx.c

+9 −8
Original line number Diff line number Diff line
@@ -75,22 +75,23 @@ void stub_complete(struct urb *urb) 
		/* OK */

		break;

	case -ENOENT:

		usbip_uinfo("stopped by a call of usb_kill_urb() because of"

			    "cleaning up a virtual connection\n");

		dev_info(&urb->dev->dev, "stopped by a call to usb_kill_urb() "

			 "because of cleaning up a virtual connection\n");

		return;

	case -ECONNRESET:

		usbip_uinfo("unlinked by a call of usb_unlink_urb()\n");

		dev_info(&urb->dev->dev, "unlinked by a call to "

			 "usb_unlink_urb()\n");

		break;

	case -EPIPE:

		usbip_uinfo("endpoint %d is stalled\n",

		dev_info(&urb->dev->dev, "endpoint %d is stalled\n",

			 usb_pipeendpoint(urb->pipe));

		break;

	case -ESHUTDOWN:

		usbip_uinfo("device removed?\n");

		dev_info(&urb->dev->dev, "device removed?\n");

		break;

	default:

		usbip_uinfo("urb completion with non-zero status %d\n",

			    urb->status);

		dev_info(&urb->dev->dev, "urb completion with non-zero status "

			 "%d\n", urb->status);

		break;

	}

drivers/staging/usbip/usbip_common.c

+105 −125
Original line number Diff line number Diff line
@@ -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)
@@ -103,56 +98,54 @@ static void usbip_dump_usb_device(struct usb_device *udev) 


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

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

			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,7 +292,7 @@ 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",

	pr_debug("BASE: cmd %u seq %u devid %u dir %u ep %u\n",

		 pdu->base.command,

		 pdu->base.seqnum,

		 pdu->base.devid,
@@ -318,8 +301,8 @@ void usbip_dump_header(struct usbip_header *pdu) 


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

		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,
@@ -327,21 +310,24 @@ void usbip_dump_header(struct usbip_header *pdu) 
			 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",

		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;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE