usb: gadget: unconditionally allocate hs/ss descriptor in bind operation

Take f_midi_bind() for example,  when composite layer call it, it will
allocate hs descriptor by calling gadget_is_dualspeed() API to check
gadget max support speed capability, but most other gadget function didn't
do like this.

To follow other function drivers, it is safe to remove the check which
mean support all possible link speed by default in function driver.

Similar change apply to midi2 and uvc.

Also in midi and midi2, as there is no descriptor difference between
super speed and super speed plus, follow other gadget function drivers,
do not allocate descriptor for super speed plus, composite layer will
handle it properly.

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

1 files changed, 16 insertions, 28 deletions

diff --git a/drivers/usb/gadget/function/f_midi2.c b/drivers/usb/gadget/function/f_midi2.c
index 5a971ba600fe..ec8cd7c7bbfc 100644
--- a/drivers/usb/gadget/function/f_midi2.c
+++ b/drivers/usb/gadget/function/f_midi2.c
@@ -1731,7 +1731,6 @@ static int f_midi2_create_usb_configs(struct f_midi2 *midi2,
 		midi1_out_eps = midi2_midi1_ep_out_descs;
 		break;
 	case USB_SPEED_SUPER:
-	case USB_SPEED_SUPER_PLUS:
 		midi2_midi1_ep_out_desc.wMaxPacketSize = cpu_to_le16(1024);
 		midi2_midi1_ep_in_desc.wMaxPacketSize = cpu_to_le16(1024);
 		for (i = 0; i < midi2->num_eps; i++)
@@ -2001,36 +2000,25 @@ static int f_midi2_bind(struct usb_configuration *c, struct usb_function *f)
 	}
 	f_midi2_free_usb_configs(&config);
 
-	if (gadget_is_dualspeed(midi2->gadget)) {
-		status = f_midi2_create_usb_configs(midi2, &config, USB_SPEED_HIGH);
-		if (status < 0)
-			goto fail;
-		f->hs_descriptors = usb_copy_descriptors(config.list);
-		if (!f->hs_descriptors) {
-			status = -ENOMEM;
-			goto fail;
-		}
-		f_midi2_free_usb_configs(&config);
+	status = f_midi2_create_usb_configs(midi2, &config, USB_SPEED_HIGH);
+	if (status < 0)
+		goto fail;
+	f->hs_descriptors = usb_copy_descriptors(config.list);
+	if (!f->hs_descriptors) {
+		status = -ENOMEM;
+		goto fail;
 	}
+	f_midi2_free_usb_configs(&config);
 
-	if (gadget_is_superspeed(midi2->gadget)) {
-		status = f_midi2_create_usb_configs(midi2, &config, USB_SPEED_SUPER);
-		if (status < 0)
-			goto fail;
-		f->ss_descriptors = usb_copy_descriptors(config.list);
-		if (!f->ss_descriptors) {
-			status = -ENOMEM;
-			goto fail;
-		}
-		if (gadget_is_superspeed_plus(midi2->gadget)) {
-			f->ssp_descriptors = usb_copy_descriptors(config.list);
-			if (!f->ssp_descriptors) {
-				status = -ENOMEM;
-				goto fail;
-			}
-		}
-		f_midi2_free_usb_configs(&config);
+	status = f_midi2_create_usb_configs(midi2, &config, USB_SPEED_SUPER);
+	if (status < 0)
+		goto fail;
+	f->ss_descriptors = usb_copy_descriptors(config.list);
+	if (!f->ss_descriptors) {
+		status = -ENOMEM;
+		goto fail;
 	}
+	f_midi2_free_usb_configs(&config);
 
 	mutex_unlock(&f_midi2_desc_mutex);
 	return 0;