leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: gadget: udc: net2280: Merge abort_dma for 228x and 338x

Browse Source 
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>
This commit is contained in:
Ricardo Ribalda Delgado 2014-11-28 14:50:55 +01:00 committed by Felipe Balbi
parent e0cbb04627
commit e721c4575d
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/usb/gadget/udc/net2280.c
View File

@ -836,12 +836,6 @@ static inline void resume_dma(struct net2280_ep *ep)
writel(readl(&ep->dma->dmactl) | BIT(DMA_ENABLE), &ep->dma->dmactl); 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 static inline void
queue_dma(struct net2280_ep *ep, struct net2280_request *req, int valid) queue_dma(struct net2280_ep *ep, struct net2280_request *req, int valid)
{ {
@ -1115,7 +1109,7 @@ static void restart_dma(struct net2280_ep *ep)
start_dma(ep, req); 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 */ /* abort the current transfer */
if (likely(!list_empty(&ep->queue))) { if (likely(!list_empty(&ep->queue))) {
@ -1127,19 +1121,6 @@ static void abort_dma_228x(struct net2280_ep *ep)
scan_dma_completions(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 */ /* dequeue ALL requests */
static void nuke(struct net2280_ep *ep) static void nuke(struct net2280_ep *ep)
{ {
@ -2813,7 +2794,7 @@ static void handle_stat0_irqs_superspeed(struct net2280 *dev,
ep->dev->protocol_stall = 1; ep->dev->protocol_stall = 1;
else { else {
if (ep->dma) if (ep->dma)
ep_stop_dma(ep); abort_dma(ep);
set_halt(ep); set_halt(ep);
} }
allow_status_338x(ep); allow_status_338x(ep);