summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorJavier Martin <javier.martin@vista-silicon.com>2012-03-22 14:54:08 +0100
committerVinod Koul <vinod.koul@linux.intel.com>2012-03-26 11:31:31 +0530
commite4756b5e068d866239b6880a7030c9d31400b254 (patch)
treefd9d157f437252aed259712a6a6e9f4ab3d40b31 /drivers/dma
parent833bc03bf14ef6d3f82d86845c29aa1f7e2037e3 (diff)
downloadlinux-e4756b5e068d866239b6880a7030c9d31400b254.tar.bz2
dmaengine: imx-dma: remove 'in_use' field of 'internal' structure.
It makes no sense keeping an 'in_use' flag when the multiple descriptor mechanism already prevents a new DMA transfer to be issued when another one is in course. Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/imx-dma.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 82d4099bd8f4..d7309e44c0df 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -131,8 +131,6 @@ enum imxdma_prep_type {
struct imxdma_channel_internal {
unsigned int resbytes;
- int in_use;
-
struct timer_list watchdog;
int hw_chaining;
@@ -266,9 +264,6 @@ static void imxdma_enable_hw(struct imxdma_desc *d)
pr_debug("imxdma%d: imx_dma_enable\n", channel);
- if (imxdmac->internal.in_use)
- return;
-
local_irq_save(flags);
imx_dmav1_writel(1 << channel, DMA_DISR);
@@ -287,7 +282,6 @@ static void imxdma_enable_hw(struct imxdma_desc *d)
DMA_CCR(channel));
}
}
- imxdmac->internal.in_use = 1;
local_irq_restore(flags);
}
@@ -307,7 +301,6 @@ static void imxdma_disable_hw(struct imxdma_channel *imxdmac)
imx_dmav1_writel(imx_dmav1_readl(DMA_CCR(channel)) & ~CCR_CEN,
DMA_CCR(channel));
imx_dmav1_writel(1 << channel, DMA_DISR);
- imxdmac->internal.in_use = 0;
local_irq_restore(flags);
}
@@ -317,7 +310,6 @@ static void imxdma_watchdog(unsigned long data)
int channel = imxdmac->channel;
imx_dmav1_writel(0, DMA_CCR(channel));
- imxdmac->internal.in_use = 0;
/* Tasklet watchdog error handler */
tasklet_schedule(&imxdmac->dma_tasklet);
@@ -436,7 +428,6 @@ static void dma_irq_handle_channel(struct imxdma_channel *imxdmac)
out:
imx_dmav1_writel(0, DMA_CCR(chno));
- imxdma->in_use = 0;
/* Tasklet irq */
tasklet_schedule(&imxdmac->dma_tasklet);
}