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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c
index ed0266462c5736628f40a7570566b583f6dd7d81..b30f85d7048060852688f2af44d8e1fc27a801d4 100644 (file)
--- a/drivers/usb/gadget/imx_udc.c
+++ b/drivers/usb/gadget/imx_udc.c
@@ -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)));

diff --git a/drivers/usb/gadget/imx_udc.h b/drivers/usb/gadget/imx_udc.h
index b48ad59603d1c6f32a21d85131c477119ea4a9f1..7136c242b4ec515481815a0793d46843d9b00fae 100644 (file)
--- a/drivers/usb/gadget/imx_udc.h
+++ b/drivers/usb/gadget/imx_udc.h
@@ -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 */