aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJassi Brar <jassi.brar@samsung.com>2010-05-04 18:22:15 +0900
committerDan Williams <dan.j.williams@intel.com>2010-05-17 01:33:56 -0700
commitcc05ea0cd63437da2033b3ce6e033b1f1aaaf640 (patch)
tree78b2786870053f56d3ba077c628d2cc975a4c737
parent8d318a50b3d72e3daf94131f91e1ab799a8d5ad4 (diff)
downloadkernel_samsung_aries-cc05ea0cd63437da2033b3ce6e033b1f1aaaf640.zip
kernel_samsung_aries-cc05ea0cd63437da2033b3ce6e033b1f1aaaf640.tar.gz
kernel_samsung_aries-cc05ea0cd63437da2033b3ce6e033b1f1aaaf640.tar.bz2
DMA ENGINE: Do not reset 'private' of channel
The member 'private' of 'struct dma_chan' is meant for passing data between client and the controller driver. The DMA client driver may point it to platform specific stuff after acquiring the channel. So, it is the responsiblity of the same code to reset it, if it must. The DMA engine doesn't set it and hence, shouldn't reset it either. This reseting of private by DMA Engine comes in the way of implementing default channel settings during DMAC probe. That capability is useful for not having the clients to always provide platform specific data, like Rx/Tx FIFO addresses, which usually doesn't change across channel requests. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--drivers/dma/dmaengine.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 790caee..21eb896 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -514,7 +514,6 @@ struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, v
break;
if (--device->privatecnt == 0)
dma_cap_clear(DMA_PRIVATE, device->cap_mask);
- chan->private = NULL;
chan = NULL;
}
}
@@ -536,7 +535,6 @@ void dma_release_channel(struct dma_chan *chan)
/* drop PRIVATE cap enabled by __dma_request_channel() */
if (--chan->device->privatecnt == 0)
dma_cap_clear(DMA_PRIVATE, chan->device->cap_mask);
- chan->private = NULL;
mutex_unlock(&dma_list_mutex);
}
EXPORT_SYMBOL_GPL(dma_release_channel);