lkml.org 
[lkml]   [2012]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 07/13] dmaengine: imx-dma: remove sg member from internal structure.
Date
This member is redundant, because it is already present in
descriptor structure. Removing it will make further removing
of 'internal' structure easier.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
---
drivers/dma/imx-dma.c | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index e8b6efa..dba62bc 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -128,7 +128,6 @@ enum imxdma_prep_type {
*/

struct imxdma_channel_internal {
- struct scatterlist *sg;
unsigned int resbytes;

int in_use;
@@ -276,11 +275,11 @@ static void imxdma_enable_hw(struct imxdma_desc *d)
CCR_ACRPT, DMA_CCR(channel));

if ((cpu_is_mx21() || cpu_is_mx27()) &&
- imxdmac->internal.sg && imxdma_hw_chain(&imxdmac->internal)) {
- imxdmac->internal.sg = sg_next(imxdmac->internal.sg);
- if (imxdmac->internal.sg) {
+ d->sg && imxdma_hw_chain(&imxdmac->internal)) {
+ d->sg = sg_next(d->sg);
+ if (d->sg) {
u32 tmp;
- imxdma_sg_next(d, imxdmac->internal.sg);
+ imxdma_sg_next(d, d->sg);
tmp = imx_dmav1_readl(DMA_CCR(channel));
imx_dmav1_writel(tmp | CCR_RPT | CCR_ACRPT,
DMA_CCR(channel));
@@ -317,7 +316,6 @@ static void imxdma_watchdog(unsigned long data)

imx_dmav1_writel(0, DMA_CCR(channel));
imxdmac->internal.in_use = 0;
- imxdmac->internal.sg = NULL;

/* Tasklet watchdog error handler */
tasklet_schedule(&imxdmac->dma_tasklet);
@@ -385,24 +383,23 @@ static void dma_irq_handle_channel(struct imxdma_channel *imxdmac)
int chno = imxdmac->channel;
struct imxdma_desc *desc;

- if (imxdma->sg) {
- u32 tmp;
- imxdma->sg = sg_next(imxdma->sg);
-
- if (imxdma->sg) {
+ spin_lock(&imxdmac->lock);
+ if (list_empty(&imxdmac->ld_active)) {
+ spin_unlock(&imxdmac->lock);
+ goto out;
+ }

- spin_lock(&imxdmac->lock);
- if (list_empty(&imxdmac->ld_active)) {
- spin_unlock(&imxdmac->lock);
- goto out;
- }
+ desc = list_first_entry(&imxdmac->ld_active,
+ struct imxdma_desc,
+ node);
+ spin_unlock(&imxdmac->lock);

- desc = list_first_entry(&imxdmac->ld_active,
- struct imxdma_desc,
- node);
- spin_unlock(&imxdmac->lock);
+ if (desc->sg) {
+ u32 tmp;
+ desc->sg = sg_next(desc->sg);

- imxdma_sg_next(desc, imxdma->sg);
+ if (desc->sg) {
+ imxdma_sg_next(desc, desc->sg);

tmp = imx_dmav1_readl(DMA_CCR(chno));

@@ -475,8 +472,6 @@ static int imxdma_xfer_desc(struct imxdma_desc *d)
/* Configure and enable */
switch (d->type) {
case IMXDMA_DESC_MEMCPY:
- imxdmac->internal.sg = NULL;
-
imx_dmav1_writel(d->src, DMA_SAR(imxdmac->channel));
imx_dmav1_writel(d->dest, DMA_DAR(imxdmac->channel));
imx_dmav1_writel(d->config_mem | (d->config_port << 2),
@@ -492,7 +487,6 @@ static int imxdma_xfer_desc(struct imxdma_desc *d)
/* Cyclic transfer is the same as slave_sg with special sg configuration. */
case IMXDMA_DESC_CYCLIC:
case IMXDMA_DESC_SLAVE_SG:
- imxdmac->internal.sg = d->sg;
imxdmac->internal.resbytes = d->len;

if (d->direction == DMA_DEV_TO_MEM) {
--
1.7.0.4


\
 
 \ /
  Last update: 2012-03-09 16:31    [W:0.131 / U:10.160 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site