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

Commit e1346fd8 authored by Shuah Khan's avatar Shuah Khan Committed by Greg Kroah-Hartman
Browse files

usbip: remove kernel addresses from usb device and urb debug msgs 



usbip_dump_usb_device() and usbip_dump_urb() print kernel addresses.
Remove kernel addresses from usb device and urb debug msgs and improve
the message content.

Instead of printing parent device and bus addresses, print parent device
and bus names.

Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b78d830f

drivers/usb/usbip/usbip_common.c

+3 −14
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static void usbip_dump_usb_device(struct usb_device *udev) 
	dev_dbg(dev, "       devnum(%d) devpath(%s) usb speed(%s)",

		udev->devnum, udev->devpath, usb_speed_string(udev->speed));



	pr_debug("tt %p, ttport %d\n", udev->tt, udev->ttport);

	pr_debug("tt hub ttport %d\n", udev->ttport);



	dev_dbg(dev, "                    ");

	for (i = 0; i < 16; i++)
@@ -124,12 +124,8 @@ static void usbip_dump_usb_device(struct usb_device *udev) 
	}

	pr_debug("\n");



	dev_dbg(dev, "parent %p, bus %p\n", udev->parent, udev->bus);



	dev_dbg(dev,

		"descriptor %p, config %p, actconfig %p, rawdescriptors %p\n",

		&udev->descriptor, udev->config,

		udev->actconfig, udev->rawdescriptors);

	dev_dbg(dev, "parent %s, bus %s\n", dev_name(&udev->parent->dev),

		udev->bus->bus_name);



	dev_dbg(dev, "have_langid %d, string_langid %d\n",

		udev->have_langid, udev->string_langid);
@@ -237,9 +233,6 @@ void usbip_dump_urb(struct urb *urb) 


	dev = &urb->dev->dev;



	dev_dbg(dev, "   urb                   :%p\n", urb);

	dev_dbg(dev, "   dev                   :%p\n", urb->dev);



	usbip_dump_usb_device(urb->dev);



	dev_dbg(dev, "   pipe                  :%08x ", urb->pipe);
@@ -248,11 +241,9 @@ void usbip_dump_urb(struct urb *urb) 


	dev_dbg(dev, "   status                :%d\n", urb->status);

	dev_dbg(dev, "   transfer_flags        :%08X\n", urb->transfer_flags);

	dev_dbg(dev, "   transfer_buffer       :%p\n", urb->transfer_buffer);

	dev_dbg(dev, "   transfer_buffer_length:%d\n",

						urb->transfer_buffer_length);

	dev_dbg(dev, "   actual_length         :%d\n", urb->actual_length);

	dev_dbg(dev, "   setup_packet          :%p\n", urb->setup_packet);



	if (urb->setup_packet && usb_pipetype(urb->pipe) == PIPE_CONTROL)

		usbip_dump_usb_ctrlrequest(
@@ -262,8 +253,6 @@ void usbip_dump_urb(struct urb *urb) 
	dev_dbg(dev, "   number_of_packets     :%d\n", urb->number_of_packets);

	dev_dbg(dev, "   interval              :%d\n", urb->interval);

	dev_dbg(dev, "   error_count           :%d\n", urb->error_count);

	dev_dbg(dev, "   context               :%p\n", urb->context);

	dev_dbg(dev, "   complete              :%p\n", urb->complete);

}

EXPORT_SYMBOL_GPL(usbip_dump_urb);