Commit 6caf745d authored by Christian Vogel's avatar Christian Vogel Committed by Greg Kroah-Hartman
Browse files

w1/ds2490: remove spurious newlines within hexdump 



Multiple pr_infos generate newlines, so the hexdump looks like...

> 0x81: count=16, status:
> 01
> 00
> 20
(...16 lines...)

We switch to a single %*ph hexdump, using the built-in %ph format,
which leads to this:

	[52769.348789] usb 2-1.3.1: Clearing ep0x83.
	[52769.349729] usb 2-1.3.1: ep_status=0x81, count=16,...
		...status=01:00:20:40:05:04:04:00:20:53:00:00:00:00:00:00

Signed-off-by: default avatarChristian Vogel <vogelchr@vogel.cx>
Link: https://lore.kernel.org/r/20220311192833.1792-2-vogelchr@vogel.cx


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 04c63387

drivers/w1/masters/ds2490.c

+3 −5
Original line number Diff line number Diff line
@@ -219,10 +219,8 @@ static void ds_dump_status(struct ds_device *dev, unsigned char *buf, int count) 
{

	int i;



	pr_info("0x%x: count=%d, status: ", dev->ep[EP_STATUS], count);

	for (i = 0; i < count; ++i)

		pr_info("%02x ", buf[i]);

	pr_info("\n");

	dev_info(&dev->udev->dev, "ep_status=0x%x, count=%d, status=%*phC",

		dev->ep[EP_STATUS], count, count, buf);



	if (count >= 16) {

		ds_print_msg(buf, "enable flag", 0);
@@ -331,7 +329,7 @@ static int ds_recv_data(struct ds_device *dev, unsigned char *buf, int size) 
	err = usb_bulk_msg(dev->udev, usb_rcvbulkpipe(dev->udev, dev->ep[EP_DATA_IN]),

				buf, size, &count, 1000);

	if (err < 0) {

		pr_info("Clearing ep0x%x.\n", dev->ep[EP_DATA_IN]);

		dev_info(&dev->udev->dev, "Clearing ep0x%x.\n", dev->ep[EP_DATA_IN]);

		usb_clear_halt(dev->udev, usb_rcvbulkpipe(dev->udev, dev->ep[EP_DATA_IN]));

		ds_recv_status(dev, NULL, true);

		return err;