Skip to content

Commit

Permalink
usb: gadget: udc: net2280: Merge abort_dma for 228x and 338x
Browse files Browse the repository at this point in the history
We can use the same function for both families of chips and also remove
the ep_stop_dma() function.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Ricardo Ribalda Delgado authored and Felipe Balbi committed Jan 12, 2015
1 parent e0cbb04 commit e721c45
Showing 1 changed file with 2 additions and 21 deletions.
23 changes: 2 additions & 21 deletions drivers/usb/gadget/udc/net2280.c
Original file line number Diff line number Diff line change
Expand Up @@ -836,12 +836,6 @@ static inline void resume_dma(struct net2280_ep *ep)
writel(readl(&ep->dma->dmactl) | BIT(DMA_ENABLE), &ep->dma->dmactl);
}

static inline void ep_stop_dma(struct net2280_ep *ep)
{
writel(readl(&ep->dma->dmactl) & ~BIT(DMA_ENABLE), &ep->dma->dmactl);
spin_stop_dma(ep->dma);
}

static inline void
queue_dma(struct net2280_ep *ep, struct net2280_request *req, int valid)
{
Expand Down Expand Up @@ -1115,7 +1109,7 @@ static void restart_dma(struct net2280_ep *ep)
start_dma(ep, req);
}

static void abort_dma_228x(struct net2280_ep *ep)
static void abort_dma(struct net2280_ep *ep)
{
/* abort the current transfer */
if (likely(!list_empty(&ep->queue))) {
Expand All @@ -1127,19 +1121,6 @@ static void abort_dma_228x(struct net2280_ep *ep)
scan_dma_completions(ep);
}

static void abort_dma_338x(struct net2280_ep *ep)
{
writel(BIT(DMA_ABORT), &ep->dma->dmastat);
spin_stop_dma(ep->dma);
}

static void abort_dma(struct net2280_ep *ep)
{
if (ep->dev->quirks & PLX_LEGACY)
return abort_dma_228x(ep);
return abort_dma_338x(ep);
}

/* dequeue ALL requests */
static void nuke(struct net2280_ep *ep)
{
Expand Down Expand Up @@ -2813,7 +2794,7 @@ static void handle_stat0_irqs_superspeed(struct net2280 *dev,
ep->dev->protocol_stall = 1;
else {
if (ep->dma)
ep_stop_dma(ep);
abort_dma(ep);
set_halt(ep);
}
allow_status_338x(ep);
Expand Down

0 comments on commit e721c45

Please sign in to comment.