[PATCH] usb: gadget: fsl: Use usb_endpoint_type() rather than duplicating its implementation

[Markus Elfring]

From: Markus Elfring <elfring at users.sourceforge.net>
Date: Tue, 24 Jun 2025 16:33:53 +0200

Reuse existing functionality from usb_endpoint_type() instead of keeping
duplicate source code.

The source code was transformed by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring at users.sourceforge.net>
---
 drivers/usb/gadget/udc/fsl_qe_udc.c   | 4 ++--
 drivers/usb/gadget/udc/fsl_udc_core.c | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/gadget/udc/fsl_qe_udc.c b/drivers/usb/gadget/udc/fsl_qe_udc.c
index aacfde06387c..6ee3da32cc4e 100644
--- a/drivers/usb/gadget/udc/fsl_qe_udc.c
+++ b/drivers/usb/gadget/udc/fsl_qe_udc.c
@@ -533,7 +533,7 @@ static int qe_ep_init(struct qe_udc *udc,
 	/* Refer to USB2.0 spec table 9-13,
 	*/
 	if (pipe_num != 0) {
-		switch (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) {
+		switch (usb_endpoint_type(desc)) {
 		case USB_ENDPOINT_XFER_BULK:
 			if (strstr(ep->ep.name, "-iso")
 					|| strstr(ep->ep.name, "-int"))
@@ -636,7 +636,7 @@ static int qe_ep_init(struct qe_udc *udc,
 
 	/* initialize ep structure */
 	ep->ep.maxpacket = max;
-	ep->tm = (u8)(desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK);
+	ep->tm = (u8) usb_endpoint_type(desc);
 	ep->ep.desc = desc;
 	ep->stopped = 0;
 	ep->init = 1;
diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index 4dea8bc30cf6..19c74ba82e16 100644
--- a/drivers/usb/gadget/udc/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
@@ -599,16 +599,14 @@ static int fsl_ep_enable(struct usb_ep *_ep,
 	struct_ep_qh_setup(udc, (unsigned char) ep_index(ep),
 			(unsigned char) ((desc->bEndpointAddress & USB_DIR_IN)
 					?  USB_SEND : USB_RECV),
-			(unsigned char) (desc->bmAttributes
-					& USB_ENDPOINT_XFERTYPE_MASK),
+			(unsigned char) usb_endpoint_type(desc),
 			max, zlt, mult);
 
 	/* Init endpoint ctrl register */
 	dr_ep_setup((unsigned char) ep_index(ep),
 			(unsigned char) ((desc->bEndpointAddress & USB_DIR_IN)
 					? USB_SEND : USB_RECV),
-			(unsigned char) (desc->bmAttributes
-					& USB_ENDPOINT_XFERTYPE_MASK));
+			(unsigned char) usb_endpoint_type(desc));
 
 	spin_unlock_irqrestore(&udc->lock, flags);
 	retval = 0;
-- 
2.50.0