Hi,
On Sun, Jun 10, 2012 at 04:15:17PM -0400, Ben Collins wrote:
> Two commits:
> - 79149b8bd0270a268344300a77a2dd3f51039f14
> usb: gadget: Update fsl_udc_core to use usb_endpoint_descriptor inside
> the struct usb_ep
> - ec39e2aeeff2901ef1b1d8ea09533e4b86ad89bb
> usb: gadget: Update fsl_qe_udc to use usb_endpoint_descriptor inside
> the struct usb_ep
>
> Did not completely convert the fsl gadget drivers to use the desc in
> usb_ep as described in commit messages. Fix the macros that were still
> referencing the old pointer.
>
> Signed-off-by: Ben Collins <bcollins@xxxxxxxxxx>
> Cc: Ido Shayevitz <idos@xxxxxxxxxxxxxx>
> Cc: Felipe Balbi <balbi@xxxxxx>
Most of those hunks were already fixed. I kept the only one which
applied and modified commit log accordingly:
From 36485439e37037008868bc22a6246d1dc42dddea Mon Sep 17 00:00:00 2001
From: Ben Collins <bcollins@xxxxxxxxxx>
Date: Sun, 10 Jun 2012 16:15:17 -0400
Subject: [PATCH] usb: gadget: Complete fsl qe/udc driver conversion
commit ec39e2ae (usb: gadget: Update fsl_qe_udc to use
usb_endpoint_descriptor inside the struct usb_ep) did
not completely convert the fsl gadget drivers to use
the desc in usb_ep as described in commit messages.
Fix the macros that were still referencing the old
pointer.
Signed-off-by: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Ido Shayevitz <idos@xxxxxxxxxxxxxx>
[ balbi@xxxxxx : brush up commit log a bit ]
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
---
drivers/usb/gadget/fsl_qe_udc.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/fsl_qe_udc.h b/drivers/usb/gadget/fsl_qe_udc.h
index 4c07ca9..7026919 100644
--- a/drivers/usb/gadget/fsl_qe_udc.h
+++ b/drivers/usb/gadget/fsl_qe_udc.h
@@ -153,10 +153,10 @@ struct usb_ep_para{
#define USB_BUSMODE_DTB 0x02
/* Endpoint basic handle */
-#define ep_index(EP) ((EP)->desc->bEndpointAddress & 0xF)
+#define ep_index(EP) ((EP)->ep.desc->bEndpointAddress & 0xF)
#define ep_maxpacket(EP) ((EP)->ep.maxpacket)
#define ep_is_in(EP) ((ep_index(EP) == 0) ? (EP->udc->ep0_dir == \
- USB_DIR_IN) : ((EP)->desc->bEndpointAddress \
+ USB_DIR_IN) : ((EP)->ep.desc->bEndpointAddress \
& USB_DIR_IN) == USB_DIR_IN)
/* ep0 transfer state */
--
1.7.10.4
--
balbi
Attachment:
signature.asc
Description: Digital signature
