ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

dmaengine: mmp: convert tasklets to use new tasklet_setup() API

Browse Source 
In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.

Signed-off-by: Romain Perier <romain.perier@gmail.com>
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Link: https://lore.kernel.org/r/20200831103542.305571-15-allen.lkml@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Allen Pais
2020-08-31 16:05:21 +05:30
committed by Vinod Koul
parent 80ef88693e
commit 77a4f4f74e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dma/mmp_pdma.c
View File

@@ -873,9 +873,9 @@ static void mmp_pdma_issue_pending(struct dma_chan *dchan)
* Do call back * Do call back
* Start pending list * Start pending list
*/ */
static void dma_do_tasklet(unsigned long data) static void dma_do_tasklet(struct tasklet_struct *t)
{ {
struct mmp_pdma_chan *chan = (struct mmp_pdma_chan *)data; struct mmp_pdma_chan *chan = from_tasklet(chan, t, tasklet);
struct mmp_pdma_desc_sw *desc, *_desc; struct mmp_pdma_desc_sw *desc, *_desc;
LIST_HEAD(chain_cleanup); LIST_HEAD(chain_cleanup);
unsigned long flags; unsigned long flags;
@@ -993,7 +993,7 @@ static int mmp_pdma_chan_init(struct mmp_pdma_device *pdev, int idx, int irq)
spin_lock_init(&chan->desc_lock); spin_lock_init(&chan->desc_lock);
chan->dev = pdev->dev; chan->dev = pdev->dev;
chan->chan.device = &pdev->device; chan->chan.device = &pdev->device;
tasklet_init(&chan->tasklet, dma_do_tasklet, (unsigned long)chan); tasklet_setup(&chan->tasklet, dma_do_tasklet);
INIT_LIST_HEAD(&chan->chain_pending); INIT_LIST_HEAD(&chan->chain_pending);
INIT_LIST_HEAD(&chan->chain_running); INIT_LIST_HEAD(&chan->chain_running);

6
drivers/dma/mmp_tdma.c
View File

@@ -346,9 +346,9 @@ static irqreturn_t mmp_tdma_int_handler(int irq, void *dev_id)
return IRQ_NONE; return IRQ_NONE;
} }
static void dma_do_tasklet(unsigned long data) static void dma_do_tasklet(struct tasklet_struct *t)
{ {
struct mmp_tdma_chan *tdmac = (struct mmp_tdma_chan *)data; struct mmp_tdma_chan *tdmac = from_tasklet(tdmac, t, tasklet);
dmaengine_desc_get_callback_invoke(&tdmac->desc, NULL); dmaengine_desc_get_callback_invoke(&tdmac->desc, NULL);
} }
@@ -586,7 +586,7 @@ static int mmp_tdma_chan_init(struct mmp_tdma_device *tdev,
tdmac->pool = pool; tdmac->pool = pool;
tdmac->status = DMA_COMPLETE; tdmac->status = DMA_COMPLETE;
tdev->tdmac[tdmac->idx] = tdmac; tdev->tdmac[tdmac->idx] = tdmac;
tasklet_init(&tdmac->tasklet, dma_do_tasklet, (unsigned long)tdmac); tasklet_setup(&tdmac->tasklet, dma_do_tasklet);
/* add the channel to tdma_chan list */ /* add the channel to tdma_chan list */
list_add_tail(&tdmac->chan.device_node, list_add_tail(&tdmac->chan.device_node,