Skip to content

Commit b1839e7

Browse files
allenpaisvinodkoul
authored andcommitted
dmaengine: xilinx: dpdma: convert tasklets to use new tasklet_setup() API
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 <[email protected]> Signed-off-by: Allen Pais <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 1311f7c commit b1839e7

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

drivers/dma/xilinx/xilinx_dpdma.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,15 +1458,15 @@ static void xilinx_dpdma_disable_irq(struct xilinx_dpdma_device *xdev)
14581458

14591459
/**
14601460
* xilinx_dpdma_chan_err_task - Per channel tasklet for error handling
1461-
* @data: tasklet data to be casted to DPDMA channel structure
1461+
* @t: pointer to the tasklet associated with this handler
14621462
*
14631463
* Per channel error handling tasklet. This function waits for the outstanding
14641464
* transaction to complete and triggers error handling. After error handling,
14651465
* re-enable channel error interrupts, and restart the channel if needed.
14661466
*/
1467-
static void xilinx_dpdma_chan_err_task(unsigned long data)
1467+
static void xilinx_dpdma_chan_err_task(struct tasklet_struct *t)
14681468
{
1469-
struct xilinx_dpdma_chan *chan = (struct xilinx_dpdma_chan *)data;
1469+
struct xilinx_dpdma_chan *chan = from_tasklet(chan, t, err_task);
14701470
struct xilinx_dpdma_device *xdev = chan->xdev;
14711471
unsigned long flags;
14721472

@@ -1555,8 +1555,7 @@ static int xilinx_dpdma_chan_init(struct xilinx_dpdma_device *xdev,
15551555
spin_lock_init(&chan->lock);
15561556
init_waitqueue_head(&chan->wait_to_stop);
15571557

1558-
tasklet_init(&chan->err_task, xilinx_dpdma_chan_err_task,
1559-
(unsigned long)chan);
1558+
tasklet_setup(&chan->err_task, xilinx_dpdma_chan_err_task);
15601559

15611560
chan->vchan.desc_free = xilinx_dpdma_chan_free_tx_desc;
15621561
vchan_init(&chan->vchan, &xdev->common);

0 commit comments

Comments
 (0)