usb: gadget: epautoconf: remove pxa quirk from ep_matches()

The same effect can be achieved by using capabilities flags, so now we can
get rid of handling of hardware specific limitations in generic code.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index af4b10a9068e7289c0f5df7873c6acd531e4ad4c..4f66e9d733cdae69d0a092807e2edad8c617d54a 100644 (file)
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -58,11 +58,6 @@ ep_matches (
                 */
                if (!ep->caps.type_int && !ep->caps.type_bulk)
                        return 0;
-               /* for now, avoid PXA "interrupt-in";
-                * it's documented as never using DATA1.
-                */
-               if (gadget_is_pxa(gadget) && ep->caps.type_int)
-                       return 0;
                break;
        }
 

diff --git a/drivers/usb/gadget/udc/pxa25x_udc.c b/drivers/usb/gadget/udc/pxa25x_udc.c
index b4d25dc4cb720f8ec1110f60621398db84a81603..b82cb14850b6cfd4b1836452451af67d1f9289b9 100644 (file)
--- a/drivers/usb/gadget/udc/pxa25x_udc.c
+++ b/drivers/usb/gadget/udc/pxa25x_udc.c
@@ -1899,8 +1899,7 @@ static struct pxa25x_udc memory = {
                        .name           = "ep5in-int",
                        .ops            = &pxa25x_ep_ops,
                        .maxpacket      = INT_FIFO_SIZE,
-                       .caps           = USB_EP_CAPS(USB_EP_CAPS_TYPE_INT,
-                                               USB_EP_CAPS_DIR_IN),
+                       .caps           = USB_EP_CAPS(0, 0),
                },
                .dev            = &memory,
                .fifo_size      = INT_FIFO_SIZE,
@@ -1978,8 +1977,7 @@ static struct pxa25x_udc memory = {
                        .name           = "ep10in-int",
                        .ops            = &pxa25x_ep_ops,
                        .maxpacket      = INT_FIFO_SIZE,
-                       .caps           = USB_EP_CAPS(USB_EP_CAPS_TYPE_INT,
-                                               USB_EP_CAPS_DIR_IN),
+                       .caps           = USB_EP_CAPS(0, 0),
                },
                .dev            = &memory,
                .fifo_size      = INT_FIFO_SIZE,
@@ -2057,8 +2055,7 @@ static struct pxa25x_udc memory = {
                        .name           = "ep15in-int",
                        .ops            = &pxa25x_ep_ops,
                        .maxpacket      = INT_FIFO_SIZE,
-                       .caps           = USB_EP_CAPS(USB_EP_CAPS_TYPE_INT,
-                                               USB_EP_CAPS_DIR_IN),
+                       .caps           = USB_EP_CAPS(0, 0),
                },
                .dev            = &memory,
                .fifo_size      = INT_FIFO_SIZE,