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: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 9 insertions, 18 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 338f91ff54c..3edc01bc41f 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -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
@@ -2853,25 +2853,16 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
         default:
                 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  */