From 4f8cfe675f4666117c93420783049eff04c3ceba Mon Sep 17 00:00:00 2001

From: Sergey Shtylyov <s.shtylyov@omp.ru>

Date: Mon, 18 Apr 2022 23:33:55 +0300

Subject: [PATCH] usb: core: devices: remove dead code under #ifdef PROC_EXTRA

Git-commit: 4f8cfe675f4666117c93420783049eff04c3ceba

References: jsc#PED-531

Patch-mainline: v5.19-rc1

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: Sergey Shtylyov <s.shtylyov@omp.ru>

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

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 drivers/usb/core/devices.c | 35 -----------------------------------

 1 file changed, 35 deletions(-)

diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c

index d8b0041de612..cc12cdd5559f 100644

--- a/drivers/usb/core/devices.c

+++ b/drivers/usb/core/devices.c

@@ -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:

-- 

2.35.3