1 files changed, 3 insertions, 19 deletions

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index c77aca11ad53..e74fd55c33d9 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -617,25 +617,9 @@ static int set_config(struct usb_composite_dev *cdev,
                 result = 0;
         }
 
-        INFO(cdev, "%s speed config #%d: %s\n",
-                ({ char *speed;
-                switch (gadget->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;
-                default:
-                        speed = "?";
-                        break;
-                } ; speed; }), number, c ? c->label : "unconfigured");
+        INFO(cdev, "%s config #%d: %s\n",
+             usb_speed_string(gadget->speed),
+             number, c ? c->label : "unconfigured");
 
         if (!c)
                 goto done;