diff options
Diffstat (limited to 'arch/sh/drivers/dma/dma-sh.c')
-rw-r--r-- | arch/sh/drivers/dma/dma-sh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c index cbbe8bce3d67..d8ece20bb2cf 100644 --- a/arch/sh/drivers/dma/dma-sh.c +++ b/arch/sh/drivers/dma/dma-sh.c | |||
@@ -60,9 +60,9 @@ static inline unsigned int calc_xmit_shift(struct dma_channel *chan) | |||
60 | * Besides that it needs to waken any waiting process, which should handle | 60 | * Besides that it needs to waken any waiting process, which should handle |
61 | * setting up the next transfer. | 61 | * setting up the next transfer. |
62 | */ | 62 | */ |
63 | static irqreturn_t dma_tei(int irq, void *dev_id, struct pt_regs *regs) | 63 | static irqreturn_t dma_tei(int irq, void *dev_id) |
64 | { | 64 | { |
65 | struct dma_channel *chan = (struct dma_channel *)dev_id; | 65 | struct dma_channel *chan = dev_id; |
66 | u32 chcr; | 66 | u32 chcr; |
67 | 67 | ||
68 | chcr = ctrl_inl(CHCR[chan->chan]); | 68 | chcr = ctrl_inl(CHCR[chan->chan]); |
@@ -228,7 +228,7 @@ static inline int dmaor_reset(void) | |||
228 | } | 228 | } |
229 | 229 | ||
230 | #if defined(CONFIG_CPU_SH4) | 230 | #if defined(CONFIG_CPU_SH4) |
231 | static irqreturn_t dma_err(int irq, void *dev_id, struct pt_regs *regs) | 231 | static irqreturn_t dma_err(int irq, void *dummy) |
232 | { | 232 | { |
233 | dmaor_reset(); | 233 | dmaor_reset(); |
234 | disable_irq(irq); | 234 | disable_irq(irq); |