Merge branch 'topic/tasklet' into next (a841592f) · Commits · 戴 / test

drivers/dma/altera-msgdma.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -680,9 +680,9 @@ static int msgdma_alloc_chan_resources(struct dma_chan *dchan)
		* msgdma_tasklet - Schedule completion tasklet
		* @data: Pointer to the Altera sSGDMA channel structure
		*/
		static void msgdma_tasklet(unsigned long data)
		static void msgdma_tasklet(struct tasklet_struct *t)
		{
		struct msgdma_device mdev = (struct msgdma_device )data;
		struct msgdma_device *mdev = from_tasklet(mdev, t, irq_tasklet);
		u32 count;
		u32 __maybe_unused size;
		u32 __maybe_unused status;
		@@ -830,7 +830,7 @@ static int msgdma_probe(struct platform_device *pdev)
		if (ret)
		return ret;

		tasklet_init(&mdev->irq_tasklet, msgdma_tasklet, (unsigned long)mdev);
		tasklet_setup(&mdev->irq_tasklet, msgdma_tasklet);

		dma_cookie_init(&mdev->dmachan);

+3 −4

Original line number	Diff line number	Diff line
		@@ -598,9 +598,9 @@ static void atc_handle_cyclic(struct at_dma_chan *atchan)

		/-- IRQ & Tasklet ---------------------------------------------------/

		static void atc_tasklet(unsigned long data)
		static void atc_tasklet(struct tasklet_struct *t)
		{
		struct at_dma_chan atchan = (struct at_dma_chan )data;
		struct at_dma_chan *atchan = from_tasklet(atchan, t, tasklet);

		if (test_and_clear_bit(ATC_IS_ERROR, &atchan->status))
		return atc_handle_error(atchan);
		@@ -1892,8 +1892,7 @@ static int __init at_dma_probe(struct platform_device *pdev)
		INIT_LIST_HEAD(&atchan->queue);
		INIT_LIST_HEAD(&atchan->free_list);

		tasklet_init(&atchan->tasklet, atc_tasklet,
		(unsigned long)atchan);
		tasklet_setup(&atchan->tasklet, atc_tasklet);
		atc_enable_chan_irq(atdma, i);
		}

+3 −4

Original line number	Diff line number	Diff line
		@@ -1613,9 +1613,9 @@ static void at_xdmac_handle_error(struct at_xdmac_chan *atchan)
		/* Then continue with usual descriptor management */
		}

		static void at_xdmac_tasklet(unsigned long data)
		static void at_xdmac_tasklet(struct tasklet_struct *t)
		{
		struct at_xdmac_chan atchan = (struct at_xdmac_chan )data;
		struct at_xdmac_chan *atchan = from_tasklet(atchan, t, tasklet);
		struct at_xdmac_desc *desc;
		u32 error_mask;

		@@ -2063,8 +2063,7 @@ static int at_xdmac_probe(struct platform_device *pdev)
		spin_lock_init(&atchan->lock);
		INIT_LIST_HEAD(&atchan->xfers_list);
		INIT_LIST_HEAD(&atchan->free_descs_list);
		tasklet_init(&atchan->tasklet, at_xdmac_tasklet,
		(unsigned long)atchan);
		tasklet_setup(&atchan->tasklet, at_xdmac_tasklet);

		/* Clear pending interrupts. */
		while (at_xdmac_chan_read(atchan, AT_XDMAC_CIS))

+3 −4

Original line number	Diff line number	Diff line
		@@ -1868,9 +1868,9 @@ static struct coh901318_desc coh901318_queue_start(struct coh901318_chan cohc)
		* This tasklet is called from the interrupt handler to
		* handle each descriptor (DMA job) that is sent to a channel.
		*/
		static void dma_tasklet(unsigned long data)
		static void dma_tasklet(struct tasklet_struct *t)
		{
		struct coh901318_chan cohc = (struct coh901318_chan ) data;
		struct coh901318_chan *cohc = from_tasklet(cohc, t, tasklet);
		struct coh901318_desc *cohd_fin;
		unsigned long flags;
		struct dmaengine_desc_callback cb;
		@@ -2615,8 +2615,7 @@ static void coh901318_base_init(struct dma_device dma, const int pick_chans,
		INIT_LIST_HEAD(&cohc->active);
		INIT_LIST_HEAD(&cohc->queue);

		tasklet_init(&cohc->tasklet, dma_tasklet,
		(unsigned long) cohc);
		tasklet_setup(&cohc->tasklet, dma_tasklet);

		list_add_tail(&cohc->chan.device_node,
		&dma->channels);

+3 −3

Original line number	Diff line number	Diff line
		@@ -463,9 +463,9 @@ static void dwc_handle_error(struct dw_dma dw, struct dw_dma_chan dwc)
		dwc_descriptor_complete(dwc, bad_desc, true);
		}

		static void dw_dma_tasklet(unsigned long data)
		static void dw_dma_tasklet(struct tasklet_struct *t)
		{
		struct dw_dma dw = (struct dw_dma )data;
		struct dw_dma *dw = from_tasklet(dw, t, tasklet);
		struct dw_dma_chan *dwc;
		u32 status_xfer;
		u32 status_err;
		@@ -1142,7 +1142,7 @@ int do_dma_probe(struct dw_dma_chip *chip)
		goto err_pdata;
		}

		tasklet_init(&dw->tasklet, dw_dma_tasklet, (unsigned long)dw);
		tasklet_setup(&dw->tasklet, dw_dma_tasklet);

		err = request_irq(chip->irq, dw_dma_interrupt, IRQF_SHARED,
		dw->name, dw);