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, 2 insertions, 19 deletions

diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 930962f49276..bd6d00802eab 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -2300,25 +2300,8 @@ usbtest_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
         usb_set_intfdata(intf, dev);
         dev_info(&intf->dev, "%s\n", info->name);
-        dev_info(&intf->dev, "%s speed {control%s%s%s%s%s} tests%s\n",
-                        ({ char *tmp;
-                        switch (udev->speed) {
-                        case USB_SPEED_LOW:
-                                tmp = "low";
-                                break;
-                        case USB_SPEED_FULL:
-                                tmp = "full";
-                                break;
-                        case USB_SPEED_HIGH:
-                                tmp = "high";
-                                break;
-                        case USB_SPEED_SUPER:
-                                tmp = "super";
-                                break;
-                        default:
-                                tmp = "unknown";
-                                break;
-                        }; tmp; }),
+        dev_info(&intf->dev, "%s {control%s%s%s%s%s} tests%s\n",
+                        usb_speed_string(udev->speed),
                         info->ctrl_out ? " in/out" : "",
                         rtest, wtest,
                         irtest, iwtest,