Revert "usb:gadget Simplify usb_decode_get_set_descriptor function." (40abbef1) · Commits · 戴 / test

This reverts commit . It's broken. Reported-by:

Stephen Rothwell <sfr@canb.auug.org.au> Cc: Felipe Balbi <balbi@kernel.org> Cc: Pawel Laszczak <pawell@cadence.com> Signed-off-by:

drivers/usb/gadget/debug.c

+55 −58

Original line number	Diff line number	Diff line
		@@ -105,8 +105,9 @@ static void usb_decode_get_set_descriptor(__u8 bRequestType, __u8 bRequest,
		__u16 wValue, __u16 wIndex,
		__u16 wLength, char *str, size_t size)
		{
		char *s;

		snprintf(str, size, "%s %s Descriptor(Index = %d, Length = %d)",
		bRequest == USB_REQ_GET_DESCRIPTOR ? "Get" : "Set",
		({ char *s;
		switch (wValue >> 8) {
		case USB_DT_DEVICE:
		s = "Device";
		@@ -159,11 +160,7 @@ static void usb_decode_get_set_descriptor(__u8 bRequestType, __u8 bRequest,
		default:
		s = "UNKNOWN";
		break;
		}

		snprintf(str, size, "%s %s Descriptor(Index = %d, Length = %d)",
		bRequest == USB_REQ_GET_DESCRIPTOR ? "Get" : "Set",
		s, wValue & 0xff, wLength);
		} s; }), wValue & 0xff, wLength);
		}

		static void usb_decode_get_configuration(__u16 wLength, char *str, size_t size)