From 5f10883630156290b8919e740931fef848ae1fdf Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 21 May 2021 10:19:20 +0100 Subject: [PATCH] Revert "FROMLIST: USB: gadget: f_fs: add SuperSpeed Plus support" This reverts commit cac70628fbe41ecf5c8f2661f3733fe4aaa8795f. This functionality is provided by upstream commit: a353397b0d5df ("usb: gadget: f_fs: Re-use SS descriptors for SuperSpeedPlus") Signed-off-by: Lee Jones Change-Id: I02ad16f4ac031f87e1567c00daaa3f6213a0a06d (cherry picked from commit 4e307150ee18c9b1b491e4885c93ddc5f495eeee) --- drivers/usb/gadget/function/f_fs.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 64df4846cc67..7df180b110af 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -3227,10 +3227,6 @@ static int _ffs_func_bind(struct usb_configuration *c, func->function.os_desc_n = c->cdev->use_os_string ? ffs->interfaces_count : 0; - if (likely(super)) { - func->function.ssp_descriptors = - usb_copy_descriptors(func->function.ss_descriptors); - } /* And we're done */ ffs_event_add(ffs, FUNCTIONFS_BIND); return 0;