diff options
| author | Felipe Balbi <balbi@ti.com> | 2015-03-11 10:00:05 -0500 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-03-11 10:00:05 -0500 |
| commit | 2c247804796bbcaa90087f2196f68fdc20a5fe04 (patch) | |
| tree | 614db37924b22f79b9ec24c65df2a49623a7ecf0 /drivers/usb/gadget/function/g_zero.h | |
| parent | d0f347d62814ec0f599a05c61c5619d5e999e4ae (diff) | |
| download | blackbird-op-linux-2c247804796bbcaa90087f2196f68fdc20a5fe04.tar.gz blackbird-op-linux-2c247804796bbcaa90087f2196f68fdc20a5fe04.zip | |
Revert "usb: gadget: zero: Add support for interrupt EP"
This reverts commit ef11982dd7a657512c362242508bb4021e0d67b6.
That commit creates a problem for some UDCs (at least musb)
where it allocates an endpoints with a 64-byte FIFO, but later
tries to use that same FIFO for 1024-byte packets.
Before implementing this, composite framework needs to be
modified so we only allocate endpoints after we know negotiated
speed, however that needs quite a bit of extra work.
Cc: <stable@vger.kernel.org> # v3.18+
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/function/g_zero.h')
| -rw-r--r-- | drivers/usb/gadget/function/g_zero.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/usb/gadget/function/g_zero.h b/drivers/usb/gadget/function/g_zero.h index 2ce28b9d97cc..15f180904f8a 100644 --- a/drivers/usb/gadget/function/g_zero.h +++ b/drivers/usb/gadget/function/g_zero.h @@ -10,8 +10,6 @@ #define GZERO_QLEN 32 #define GZERO_ISOC_INTERVAL 4 #define GZERO_ISOC_MAXPACKET 1024 -#define GZERO_INT_INTERVAL 1 /* Default interrupt interval = 1 ms */ -#define GZERO_INT_MAXPACKET 1024 struct usb_zero_options { unsigned pattern; @@ -19,10 +17,6 @@ struct usb_zero_options { unsigned isoc_maxpacket; unsigned isoc_mult; unsigned isoc_maxburst; - unsigned int_interval; /* In ms */ - unsigned int_maxpacket; - unsigned int_mult; - unsigned int_maxburst; unsigned bulk_buflen; unsigned qlen; }; @@ -34,10 +28,6 @@ struct f_ss_opts { unsigned isoc_maxpacket; unsigned isoc_mult; unsigned isoc_maxburst; - unsigned int_interval; /* In ms */ - unsigned int_maxpacket; - unsigned int_mult; - unsigned int_maxburst; unsigned bulk_buflen; /* @@ -72,7 +62,6 @@ int lb_modinit(void); void free_ep_req(struct usb_ep *ep, struct usb_request *req); void disable_endpoints(struct usb_composite_dev *cdev, struct usb_ep *in, struct usb_ep *out, - struct usb_ep *iso_in, struct usb_ep *iso_out, - struct usb_ep *int_in, struct usb_ep *int_out); + struct usb_ep *iso_in, struct usb_ep *iso_out); #endif /* __G_ZERO_H */ |
