Commit 4f8cfe67 authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Greg Kroah-Hartman
Browse files

usb: core: devices: remove dead code under #ifdef PROC_EXTRA 



usb_dump_hub_descriptor() and usb_dump_string() are defined under #ifdef
PROC_EXTRA (while PROC_EXTRA doesn't seem to have ever been #define'd)
since the dawn of the git era -- remove this dead code at last...

Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>

Link: https://lore.kernel.org/r/ec08915b-faf2-2f0b-dfb1-048dfa2c67f3@omp.ru


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

drivers/usb/core/devices.c

+0 −35
Original line number Diff line number Diff line
@@ -390,41 +390,6 @@ static char *usb_dump_desc(char *start, char *end, struct usb_device *dev) 
	return start;

}





#ifdef PROC_EXTRA /* TBD: may want to add this code later */



static char *usb_dump_hub_descriptor(char *start, char *end,

				     const struct usb_hub_descriptor *desc)

{

	int leng = USB_DT_HUB_NONVAR_SIZE;

	unsigned char *ptr = (unsigned char *)desc;



	if (start > end)

		return start;

	start += sprintf(start, "Interface:");

	while (leng && start <= end) {

		start += sprintf(start, " %02x", *ptr);

		ptr++; leng--;

	}

	*start++ = '\n';

	return start;

}



static char *usb_dump_string(char *start, char *end,

			     const struct usb_device *dev, char *id, int index)

{

	if (start > end)

		return start;

	start += sprintf(start, "Interface:");

	if (index <= dev->maxstring && dev->stringindex &&

	    dev->stringindex[index])

		start += sprintf(start, "%s: %.100s ", id,

				 dev->stringindex[index]);

	return start;

}



#endif /* PROC_EXTRA */



/*****************************************************************/



/* This is a recursive function. Parameters: