sh: Drop name overload in dma-sh. (e803aaf6) · Commits · 戴 / test

Pass along the dev_id from request_dma() all the way down, rather than inserting an artificial name relating to the TEI line that we were doing before. This makes the line a bit less obvious, but dev_id is the proper behaviour for this regardless. Signed-off-by:

Paul Mundt <lethal@linux-sh.org>

arch/sh/drivers/dma/dma-sh.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -94,20 +94,13 @@ static int sh_dmac_request_dma(struct dma_channel *chan)
		if (unlikely(!chan->flags & DMA_TEI_CAPABLE))
		return 0;

		chan->name = kzalloc(32, GFP_KERNEL);
		if (unlikely(chan->name == NULL))
		return -ENOMEM;
		snprintf(chan->name, 32, "DMAC Transfer End (Channel %d)",
		chan->chan);

		return request_irq(get_dmte_irq(chan->chan), dma_tei,
		IRQF_DISABLED, chan->name, chan);
		IRQF_DISABLED, chan->dev_id, chan);
		}

		static void sh_dmac_free_dma(struct dma_channel *chan)
		{
		free_irq(get_dmte_irq(chan->chan), chan);
		kfree(chan->name);
		}

		static void

Admin message