dmaengine: sf-pdma: convert tasklets to use new tasklet_setup() API
PATCH 1/2 dmaengine: sf-pdma: convert tasklets to use new tasklet_setup() API
From: Allen Pais <[email protected]>
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.
--- drivers/dma/sf-pdma/sf-pdma.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/dma/sf-pdma/sf-pdma.c +6 -8
@@ -281,9 +281,9 @@ static void sf_pdma_free_desc(struct virt_dma_desc *vdesc) desc->in_use = false; } -static void sf_pdma_donebh_tasklet (unsigned long arg) +static void sf_pdma_donebh_tasklet (struct tasklet_struct *t) { -struct sf_pdma_chan *chan = (struct sf_pdma_chan *)arg; +struct sf_pdma_chan *chan =from_tasklet (chan, t, done_tasklet);unsigned long flags;spin_lock_irqsave (&chan->lock, flags);
@@ -300,9 +300,9 @@ static void sf_pdma_donebh_tasklet(unsigned long arg)spin_unlock_irqrestore (&chan->vchan.lock, flags); } -static void sf_pdma_errbh_tasklet (unsigned long arg) +static void sf_pdma_errbh_tasklet (struct tasklet_struct *t) { -struct sf_pdma_chan *chan = (struct sf_pdma_chan *)arg; +struct sf_pdma_chan *chan =from_tasklet (chan, t, err_tasklet);struct sf_pdma_desc *desc = chan->desc;unsigned long flags;
@@ -475,10 +475,8 @@ static void sf_pdma_setup_chans(struct sf_pdma *pdma)writel (PDMA_CLEAR_CTRL , chan->regs.ctrl); -tasklet_init (&chan->done_tasklet, - sf_pdma_donebh_tasklet, (unsigned long )chan); -tasklet_init (&chan->err_tasklet, - sf_pdma_errbh_tasklet, (unsigned long )chan); +tasklet_setup (&chan->done_tasklet, sf_pdma_donebh_tasklet); +tasklet_setup (&chan->err_tasklet, sf_pdma_errbh_tasklet); } }
Signature · 1 line
2.25.1
PATCH 2/2 dmaengine: xilinx: dpdma: convert tasklets to use new tasklet_setup() API
From: Allen Pais <[email protected]>
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.
--- drivers/dma/xilinx/xilinx_dpdma.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/dma/xilinx/xilinx_dpdma.c +4 -5
@@ -1458,15 +1458,15 @@ static void xilinx_dpdma_disable_irq(struct xilinx_dpdma_device *xdev)/** * xilinx_dpdma_chan_err_task - Per channel tasklet for error handling -* @data: tasklet data to be casted to DPDMA channel structure +* @t: pointer to the tasklet associated with this handler * * Per channel error handling tasklet. This function waits for the outstanding * transaction to complete and triggers error handling. After error handling, * re-enable channel error interrupts, and restart the channel if needed. */ -static void xilinx_dpdma_chan_err_task (unsigned long data) +static void xilinx_dpdma_chan_err_task (struct tasklet_struct *t) { -struct xilinx_dpdma_chan *chan = (struct xilinx_dpdma_chan *)data; +struct xilinx_dpdma_chan *chan =from_tasklet (chan, t, err_task);struct xilinx_dpdma_device *xdev = chan->xdev;unsigned long flags;
@@ -1555,8 +1555,7 @@ static int xilinx_dpdma_chan_init(struct xilinx_dpdma_device *xdev,spin_lock_init (&chan->lock);init_waitqueue_head (&chan->wait_to_stop); -tasklet_init (&chan->err_task, xilinx_dpdma_chan_err_task, - (unsigned long )chan); +tasklet_setup (&chan->err_task, xilinx_dpdma_chan_err_task); chan->vchan.desc_free = xilinx_dpdma_chan_free_tx_desc;vchan_init (&chan->vchan, &xdev->common);
Signature · 1 line
2.25.1
Quoted 6 lines · Allen Pais
From: Allen Pais <[email protected]>
In preparation for unconditionally passing the struct
tasklet_structpointer to all tasklet callbacks, switch to using the newtasklet_setup()andfrom_tasklet()to pass the tasklet pointer explicitly.
Applied, thanks
Signature · 1 line
~Vinod