Commit f19a11d4 authored by Allen Pais's avatar Allen Pais Committed by Vinod Koul
Browse files

dmaengine: xilinx: 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: default avatarRomain Perier <romain.perier@gmail.com>
Signed-off-by: default avatarAllen Pais <allen.lkml@gmail.com>
Link: https://lore.kernel.org/r/20200831103542.305571-33-allen.lkml@gmail.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 0e71d9b9

drivers/dma/xilinx/xilinx_dma.c

+3 −4
Original line number Diff line number Diff line
@@ -1046,9 +1046,9 @@ static void xilinx_dma_chan_desc_cleanup(struct xilinx_dma_chan *chan) 
 * xilinx_dma_do_tasklet - Schedule completion tasklet

 * @data: Pointer to the Xilinx DMA channel structure

 */

static void xilinx_dma_do_tasklet(unsigned long data)

static void xilinx_dma_do_tasklet(struct tasklet_struct *t)

{

	struct xilinx_dma_chan *chan = (struct xilinx_dma_chan *)data;

	struct xilinx_dma_chan *chan = from_tasklet(chan, t, tasklet);



	xilinx_dma_chan_desc_cleanup(chan);

}
@@ -2846,8 +2846,7 @@ static int xilinx_dma_chan_probe(struct xilinx_dma_device *xdev, 
	}



	/* Initialize the tasklet */

	tasklet_init(&chan->tasklet, xilinx_dma_do_tasklet,

			(unsigned long)chan);

	tasklet_setup(&chan->tasklet, xilinx_dma_do_tasklet);



	/*

	 * Initialize the DMA channel and add it to the DMA engine channels

drivers/dma/xilinx/zynqmp_dma.c

+3 −3
Original line number Diff line number Diff line
@@ -744,9 +744,9 @@ static irqreturn_t zynqmp_dma_irq_handler(int irq, void *data) 
 * zynqmp_dma_do_tasklet - Schedule completion tasklet

 * @data: Pointer to the ZynqMP DMA channel structure

 */

static void zynqmp_dma_do_tasklet(unsigned long data)

static void zynqmp_dma_do_tasklet(struct tasklet_struct *t)

{

	struct zynqmp_dma_chan *chan = (struct zynqmp_dma_chan *)data;

	struct zynqmp_dma_chan *chan = from_tasklet(chan, t, tasklet);

	u32 count;

	unsigned long irqflags;
@@ -908,7 +908,7 @@ static int zynqmp_dma_chan_probe(struct zynqmp_dma_device *zdev, 


	chan->is_dmacoherent =  of_property_read_bool(node, "dma-coherent");

	zdev->chan = chan;

	tasklet_init(&chan->tasklet, zynqmp_dma_do_tasklet, (ulong)chan);

	tasklet_setup(&chan->tasklet, zynqmp_dma_do_tasklet);

	spin_lock_init(&chan->lock);

	INIT_LIST_HEAD(&chan->active_list);

	INIT_LIST_HEAD(&chan->pending_list);

CRA Git | Maintained and supported by SUSTech CRA and CCSE