usbip: stub: stop printing kernel pointer addresses in messages (248a2204) · Commits · 戴 / test

drivers/usb/usbip/stub_main.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -237,11 +237,12 @@ void stub_device_cleanup_urbs(struct stub_device *sdev)
		struct stub_priv *priv;
		struct urb *urb;

		dev_dbg(&sdev->udev->dev, "free sdev %p\n", sdev);
		dev_dbg(&sdev->udev->dev, "Stub device cleaning up urbs\n");

		while ((priv = stub_priv_pop(sdev))) {
		urb = priv->urb;
		dev_dbg(&sdev->udev->dev, "free urb %p\n", urb);
		dev_dbg(&sdev->udev->dev, "free urb seqnum %lu\n",
		priv->seqnum);
		usb_kill_urb(urb);

		kmem_cache_free(stub_priv_cache, priv);

+2 −5

Original line number	Diff line number	Diff line
		@@ -211,9 +211,6 @@ static int stub_recv_cmd_unlink(struct stub_device *sdev,
		if (priv->seqnum != pdu->u.cmd_unlink.seqnum)
		continue;

		dev_info(&priv->urb->dev->dev, "unlink urb %p\n",
		priv->urb);

		/*
		* This matched urb is not completed yet (i.e., be in
		* flight in usb hcd hardware/driver). Now we are
		@@ -252,8 +249,8 @@ static int stub_recv_cmd_unlink(struct stub_device *sdev,
		ret = usb_unlink_urb(priv->urb);
		if (ret != -EINPROGRESS)
		dev_err(&priv->urb->dev->dev,
		"failed to unlink a urb %p, ret %d\n",
		priv->urb, ret);
		"failed to unlink a urb # %lu, ret %d\n",
		priv->seqnum, ret);

		return 0;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ void stub_complete(struct urb *urb)
		/* link a urb to the queue of tx. */
		spin_lock_irqsave(&sdev->priv_lock, flags);
		if (sdev->ud.tcp_socket == NULL) {
		usbip_dbg_stub_tx("ignore urb for closed connection %p", urb);
		usbip_dbg_stub_tx("ignore urb for closed connection\n");
		/* It will be freed in stub_device_cleanup_urbs(). */
		} else if (priv->unlinking) {
		stub_enqueue_ret_unlink(sdev, priv->seqnum, urb->status);
		@@ -190,8 +190,8 @@ static int stub_send_ret_submit(struct stub_device *sdev)

		/* 1. setup usbip_header */
		setup_ret_submit_pdu(&pdu_header, urb);
		usbip_dbg_stub_tx("setup txdata seqnum: %d urb: %p\n",
		pdu_header.base.seqnum, urb);
		usbip_dbg_stub_tx("setup txdata seqnum: %d\n",
		pdu_header.base.seqnum);
		usbip_header_correct_endian(&pdu_header, 1);

		iov[iovnum].iov_base = &pdu_header;