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, 3 insertions, 11 deletions

diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 5d3e697b7d5..68a0efbc271 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -962,23 +962,15 @@ printer_set_config(struct printer_dev *dev, unsigned number)
                 usb_gadget_vbus_draw(dev->gadget,
                                 dev->gadget->is_otg ? 8 : 100);
         } else {
-                char *speed;
                 unsigned power;
 
                 power = 2 * config_desc.bMaxPower;
                 usb_gadget_vbus_draw(dev->gadget, power);
 
-                switch (gadget->speed) {
-                case USB_SPEED_FULL:    speed = "full"; break;
-#ifdef CONFIG_USB_GADGET_DUALSPEED
-                case USB_SPEED_HIGH:    speed = "high"; break;
-#endif
-                default:                speed = "?"; break;
-                }
-
                 dev->config = number;
-                INFO(dev, "%s speed config #%d: %d mA, %s\n",
-                                speed, number, power, driver_desc);
+                INFO(dev, "%s config #%d: %d mA, %s\n",
+                     usb_speed_string(gadget->speed),
+                     number, power, driver_desc);
         }
         return result;
 }