diff options
| author | Ricardo Ribalda Delgado | 2014-11-28 14:50:56 +0100 |
|---|---|---|
| committer | Felipe Balbi | 2015-01-12 19:13:28 +0100 |
| commit | 485f44d06b352a788d07e79a5744cc7420adc1e4 (patch) | |
| tree | 00ae08a6a6f2c7de6b78cca34df36cd425d43a40 /drivers/usb/gadget/udc/net2280.c | |
| parent | usb: gadget: udc: net2280: Merge abort_dma for 228x and 338x (diff) | |
| download | kernel-qcow2-linux-485f44d06b352a788d07e79a5744cc7420adc1e4.tar.gz kernel-qcow2-linux-485f44d06b352a788d07e79a5744cc7420adc1e4.tar.xz kernel-qcow2-linux-485f44d06b352a788d07e79a5744cc7420adc1e4.zip | |
usb: gadget: udc: net2280: Clean function net2280_queue
Do not duplicate the code for the else branch of the condition.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/udc/net2280.c')
| -rw-r--r-- | drivers/usb/gadget/udc/net2280.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c index 46b66b3fe8e1..ade46939b02a 100644 --- a/drivers/usb/gadget/udc/net2280.c +++ b/drivers/usb/gadget/udc/net2280.c @@ -937,24 +937,12 @@ net2280_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) _req->actual = 0; /* kickstart this i/o queue? */ - if (list_empty(&ep->queue) && !ep->stopped) { - /* DMA request while EP halted */ - if (ep->dma && - (readl(&ep->regs->ep_rsp) & BIT(CLEAR_ENDPOINT_HALT)) && - (dev->quirks & PLX_SUPERSPEED)) { - int valid = 1; - if (ep->is_in) { - int expect; - expect = likely(req->req.zero || - ((req->req.length % - ep->ep.maxpacket) != 0)); - if (expect != ep->in_fifo_validate) - valid = 0; - } - queue_dma(ep, req, valid); - } + if (list_empty(&ep->queue) && !ep->stopped && + !((dev->quirks & PLX_SUPERSPEED) && ep->dma && + (readl(&ep->regs->ep_rsp) & BIT(CLEAR_ENDPOINT_HALT)))) { + /* use DMA if the endpoint supports it, else pio */ - else if (ep->dma) + if (ep->dma) start_dma(ep, req); else { /* maybe there's no control data, just status ack */ |