[PATCH] DMA ENGINE: Do not reset 'private' of channel

Previous thread: [GIT PULL] i2c fixes for 2.6.34 by Jean Delvare on Tuesday, May 4, 2010 - 2:12 am. (1 message)

Next thread: [PATCH] hwmon: applesmc: Add temperature sensor labels to sysfs interface by Henrik Rydberg on Tuesday, May 4, 2010 - 2:55 am. (4 messages)
From: Jassi Brar
Date: Tuesday, May 4, 2010 - 2:22 am

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.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>

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.

---
 drivers/dma/dmaengine.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 6f51a0a..d911e38 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);
-- 
1.6.2.5

--

From: Dan Williams
Date: Friday, May 7, 2010 - 5:09 pm

Ok I like this explanation better than the changelog you have above
because it clarifies that the driver is setting a default that the
client can override at registration time, but when this is happening
dmaengine should get out of the way.

Applied.

Thanks,
Dan
--

Previous thread: [GIT PULL] i2c fixes for 2.6.34 by Jean Delvare on Tuesday, May 4, 2010 - 2:12 am. (1 message)

Next thread: [PATCH] hwmon: applesmc: Add temperature sensor labels to sysfs interface by Henrik Rydberg on Tuesday, May 4, 2010 - 2:55 am. (4 messages)