Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaef50c7 authored by John Youn's avatar John Youn Committed by Felipe Balbi
Browse files

usb: gadget: Update usb_assign_descriptors for SuperSpeedPlus 



Add the 'ssp_descriptors' parameter to the usb_assign_descriptors()
function. This allows a function driver to add descriptors for
SuperSpeedPlus speeds if it supports it.

Also update all uses of this function in the gadget subsystem so that
they pass NULL for the ssp_descriptors parameters.

Signed-off-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
parent f228a8de

drivers/usb/gadget/config.c

+2 −1
Original line number Diff line number Diff line
@@ -163,7 +163,8 @@ EXPORT_SYMBOL_GPL(usb_copy_descriptors); 
int usb_assign_descriptors(struct usb_function *f,

		struct usb_descriptor_header **fs,

		struct usb_descriptor_header **hs,

		struct usb_descriptor_header **ss)

		struct usb_descriptor_header **ss,

		struct usb_descriptor_header **ssp)

{

	struct usb_gadget *g = f->config->cdev->gadget;

drivers/usb/gadget/function/f_acm.c

+1 −1
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ acm_bind(struct usb_configuration *c, struct usb_function *f) 
	acm_ss_out_desc.bEndpointAddress = acm_fs_out_desc.bEndpointAddress;



	status = usb_assign_descriptors(f, acm_fs_function, acm_hs_function,

			acm_ss_function);

			acm_ss_function, NULL);

	if (status)

		goto fail;

drivers/usb/gadget/function/f_ecm.c

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f) 
		fs_ecm_notify_desc.bEndpointAddress;



	status = usb_assign_descriptors(f, ecm_fs_function, ecm_hs_function,

			ecm_ss_function);

			ecm_ss_function, NULL);

	if (status)

		goto fail;

drivers/usb/gadget/function/f_eem.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static int eem_bind(struct usb_configuration *c, struct usb_function *f) 
	eem_ss_out_desc.bEndpointAddress = eem_fs_out_desc.bEndpointAddress;



	status = usb_assign_descriptors(f, eem_fs_function, eem_hs_function,

			eem_ss_function);

			eem_ss_function, NULL);

	if (status)

		goto fail;

drivers/usb/gadget/function/f_hid.c

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) 
		hidg_fs_out_ep_desc.bEndpointAddress;



	status = usb_assign_descriptors(f, hidg_fs_descriptors,

			hidg_hs_descriptors, NULL);

			hidg_hs_descriptors, NULL, NULL);

	if (status)

		goto fail;