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

Commit 06c3859f authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

usb: gadget/imx-udc: remove usage of deprecated symbol USBD_INT0 



Since v2.6.34-rc2~66^2~5^2~47 USBD_INT0 is deprecated in favour of
MX1_USBD_INT0.  So use the new name.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f7043ecb

drivers/usb/gadget/imx_udc.c

+2 −2
Original line number Diff line number Diff line
@@ -1194,10 +1194,10 @@ static irqreturn_t imx_udc_ctrl_irq(int irq, void *dev) 
static irqreturn_t imx_udc_bulk_irq(int irq, void *dev)

{

	struct imx_udc_struct *imx_usb = dev;

	struct imx_ep_struct *imx_ep = &imx_usb->imx_ep[irq - USBD_INT0];

	struct imx_ep_struct *imx_ep = &imx_usb->imx_ep[irq - MX1_USBD_INT0];

	int intr = __raw_readl(imx_usb->base + USB_EP_INTR(EP_NO(imx_ep)));



	dump_ep_intr(__func__, irq - USBD_INT0, intr, imx_usb->dev);

	dump_ep_intr(__func__, irq - MX1_USBD_INT0, intr, imx_usb->dev);



	if (!imx_usb->driver) {

		__raw_writel(intr, imx_usb->base + USB_EP_INTR(EP_NO(imx_ep)));

drivers/usb/gadget/imx_udc.h

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ 
/* Helper macros */

#define EP_NO(ep)	((ep->bEndpointAddress) & ~USB_DIR_IN) /* IN:1, OUT:0 */

#define EP_DIR(ep)	((ep->bEndpointAddress) & USB_DIR_IN ? 1 : 0)

#define irq_to_ep(irq)	(((irq) >= USBD_INT0) || ((irq) <= USBD_INT6) \

		? ((irq) - USBD_INT0) : (USBD_INT6)) /*should not happen*/

#define ep_to_irq(ep)	(EP_NO((ep)) + USBD_INT0)

#define IMX_USB_NB_EP	6



/* Driver structures */