usb: gadget: composite: cleanup function config_ep_by_speed_and_alt()

When call this function, gadget already have working speed, if it is
USB_SPEED_SUPER_PLUS, in theroy gadget_is_superspeed_plus() checking
should be true, so there is no need to call it. it is same for other
working speed.

Remove all gadget_is_{*}speed_plus() API call to clean it up.

Signed-off-by: Linyu Yuan <quic_linyyuan@quicinc.com>
Link: https://lore.kernel.org/r/20230803091053.9714-7-quic_linyyuan@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index dd9b904..0ace45b 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -170,33 +170,27 @@ int config_ep_by_speed_and_alt(struct usb_gadget *g,
        /* select desired speed */
        switch (g->speed) {
        case USB_SPEED_SUPER_PLUS:
-               if (gadget_is_superspeed_plus(g)) {
-                       if (f->ssp_descriptors) {
-                               speed_desc = f->ssp_descriptors;
-                               want_comp_desc = 1;
-                               break;
-                       }
-                       incomplete_desc = true;
+               if (f->ssp_descriptors) {
+                       speed_desc = f->ssp_descriptors;
+                       want_comp_desc = 1;
+                       break;
                }
+               incomplete_desc = true;
                fallthrough;
        case USB_SPEED_SUPER:
-               if (gadget_is_superspeed(g)) {
-                       if (f->ss_descriptors) {
-                               speed_desc = f->ss_descriptors;
-                               want_comp_desc = 1;
-                               break;
-                       }
-                       incomplete_desc = true;
+               if (f->ss_descriptors) {
+                       speed_desc = f->ss_descriptors;
+                       want_comp_desc = 1;
+                       break;
                }
+               incomplete_desc = true;
                fallthrough;
        case USB_SPEED_HIGH:
-               if (gadget_is_dualspeed(g)) {
-                       if (f->hs_descriptors) {
-                               speed_desc = f->hs_descriptors;
-                               break;
-                       }
-                       incomplete_desc = true;
+               if (f->hs_descriptors) {
+                       speed_desc = f->hs_descriptors;
+                       break;
                }
+               incomplete_desc = true;
                fallthrough;
        default:
                speed_desc = f->fs_descriptors;