Commit e538dfda authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Greg Kroah-Hartman
Browse files

usb: Provide usb_speed_string() function 



In a few places in the kernel, the code prints
a human-readable USB device speed (eg. "high speed").
This involves a switch statement sometimes wrapped
around in ({ ... }) block leading to code repetition.

To mitigate this issue, this commit introduces
usb_speed_string() function, which returns
a human-readable name of provided speed.

It also changes a few places switch was used to use
this new function.  This changes a bit the way the
speed is printed in few instances at the same time
standardising it.

Signed-off-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c58a76cd

drivers/usb/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ menuconfig USB_SUPPORT 


if USB_SUPPORT



config USB_COMMON

	tristate

	default y

	depends on USB || USB_GADGET



# Host-side USB depends on having a host controller

# NOTE:  dummy_hcd is always an option, but it's ignored here ...

# NOTE:  SL-811 option should be board-specific ...

drivers/usb/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -53,3 +53,5 @@ obj-$(CONFIG_USB_MUSB_HDRC) += musb/ 
obj-$(CONFIG_USB_RENESAS_USBHS)	+= renesas_usbhs/

obj-$(CONFIG_USB_OTG_UTILS)	+= otg/

obj-$(CONFIG_USB_GADGET)	+= gadget/



obj-$(CONFIG_USB_COMMON)	+= usb-common.o

drivers/usb/core/hub.c

+9 −18
Original line number Diff line number Diff line
@@ -2793,7 +2793,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, 
	int			i, j, retval;

	unsigned		delay = HUB_SHORT_RESET_TIME;

	enum usb_device_speed	oldspeed = udev->speed;

	char 			*speed, *type;

	const char		*speed;

	int			devnum = udev->devnum;



	/* root hub ports have a slightly longer reset period
@@ -2854,24 +2854,15 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, 
		goto fail;

	}



	type = "";

	switch (udev->speed) {

	case USB_SPEED_LOW:	speed = "low";	break;

	case USB_SPEED_FULL:	speed = "full";	break;

	case USB_SPEED_HIGH:	speed = "high";	break;

	case USB_SPEED_SUPER:

				speed = "super";

				break;

	case USB_SPEED_WIRELESS:

				speed = "variable";

				type = "Wireless ";

				break;

	default: 		speed = "?";	break;

	}

	if (udev->speed == USB_SPEED_WIRELESS)

		speed = "variable speed Wireless";

	else

		speed = usb_speed_string(udev->speed);



	if (udev->speed != USB_SPEED_SUPER)

		dev_info(&udev->dev,

				"%s %s speed %sUSB device number %d using %s\n",

				(udev->config) ? "reset" : "new", speed, type,

				"%s %s USB device number %d using %s\n",

				(udev->config) ? "reset" : "new", speed,

				devnum, udev->bus->controller->driver->name);



	/* Set up TT records, if needed  */

drivers/usb/gadget/amd5536udc.c

+2 −7
Original line number Diff line number Diff line
@@ -3005,13 +3005,8 @@ __acquires(dev->lock) 


		/* link up all endpoints */

		udc_setup_endpoints(dev);

		if (dev->gadget.speed == USB_SPEED_HIGH) {

			dev_info(&dev->pdev->dev, "Connect: speed = %s\n",

				"high");

		} else if (dev->gadget.speed == USB_SPEED_FULL) {

			dev_info(&dev->pdev->dev, "Connect: speed = %s\n",

				"full");

		}

		dev_info(&dev->pdev->dev, "Connect: %s\n",

			 usb_speed_string(dev->gadget.speed));



		/* init ep 0 */

		activate_control_endpoints(dev);

drivers/usb/gadget/atmel_usba_udc.c

+4 −5
Original line number Diff line number Diff line
@@ -1718,13 +1718,12 @@ static irqreturn_t usba_udc_irq(int irq, void *devid) 
			spin_lock(&udc->lock);

		}



		if (status & USBA_HIGH_SPEED) {

			DBG(DBG_BUS, "High-speed bus reset detected\n");

		if (status & USBA_HIGH_SPEED)

			udc->gadget.speed = USB_SPEED_HIGH;

		} else {

			DBG(DBG_BUS, "Full-speed bus reset detected\n");

		else

			udc->gadget.speed = USB_SPEED_FULL;

		}

		DBG(DBG_BUS, "%s bus reset detected\n",

		    usb_speed_string(udc->gadget.speed));



		ep0 = &usba_ep[0];

		ep0->desc = &usba_ep0_desc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE