diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-11-24 00:50:05 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-12-05 20:45:39 -0500 |
commit | e803aaf63a18b26668fbfbfd41c65527bcc10532 (patch) | |
tree | a36a619813ef83b381ddbdafb1ea0dc494516ce6 /arch/sh/drivers | |
parent | 49f860bb5db877a2c75642e7e19af40e3010afec (diff) |
sh: Drop name overload in dma-sh.
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>
Diffstat (limited to 'arch/sh/drivers')
-rw-r--r-- | arch/sh/drivers/dma/dma-sh.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c index 660786013350..f63721ed86c2 100644 --- a/arch/sh/drivers/dma/dma-sh.c +++ b/arch/sh/drivers/dma/dma-sh.c | |||
@@ -94,20 +94,13 @@ static int sh_dmac_request_dma(struct dma_channel *chan) | |||
94 | if (unlikely(!chan->flags & DMA_TEI_CAPABLE)) | 94 | if (unlikely(!chan->flags & DMA_TEI_CAPABLE)) |
95 | return 0; | 95 | return 0; |
96 | 96 | ||
97 | chan->name = kzalloc(32, GFP_KERNEL); | ||
98 | if (unlikely(chan->name == NULL)) | ||
99 | return -ENOMEM; | ||
100 | snprintf(chan->name, 32, "DMAC Transfer End (Channel %d)", | ||
101 | chan->chan); | ||
102 | |||
103 | return request_irq(get_dmte_irq(chan->chan), dma_tei, | 97 | return request_irq(get_dmte_irq(chan->chan), dma_tei, |
104 | IRQF_DISABLED, chan->name, chan); | 98 | IRQF_DISABLED, chan->dev_id, chan); |
105 | } | 99 | } |
106 | 100 | ||
107 | static void sh_dmac_free_dma(struct dma_channel *chan) | 101 | static void sh_dmac_free_dma(struct dma_channel *chan) |
108 | { | 102 | { |
109 | free_irq(get_dmte_irq(chan->chan), chan); | 103 | free_irq(get_dmte_irq(chan->chan), chan); |
110 | kfree(chan->name); | ||
111 | } | 104 | } |
112 | 105 | ||
113 | static void | 106 | static void |