arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq...

Convert calls to free_irq so that the second argument is the same as the
last argument of the corresponding call to request_irq.  Without this
property, free_irq does nothing.

In the case of dmabrg.c the change is merely cosmetic - changing 0 to NULL.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/drivers/dma/dma-g2.c b/arch/sh/drivers/dma/dma-g2.c
index be9ca7ca0ce40a028793fa597903470e17e60fd3..e1ab6eb3c04bbabd114e310562c27d25a2ccc0d4 100644 (file)
--- a/arch/sh/drivers/dma/dma-g2.c
+++ b/arch/sh/drivers/dma/dma-g2.c
@@ -181,14 +181,14 @@ static int __init g2_dma_init(void)
 
        ret = register_dmac(&g2_dma_info);
        if (unlikely(ret != 0))
-               free_irq(HW_EVENT_G2_DMA, 0);
+               free_irq(HW_EVENT_G2_DMA, &g2_dma_info);
 
        return ret;
 }
 
 static void __exit g2_dma_exit(void)
 {
-       free_irq(HW_EVENT_G2_DMA, 0);
+       free_irq(HW_EVENT_G2_DMA, &g2_dma_info);
        unregister_dmac(&g2_dma_info);
 }
 

diff --git a/arch/sh/drivers/dma/dmabrg.c b/arch/sh/drivers/dma/dmabrg.c
index 3d66a32ce610dd60770081cee2dd149e9b665b9c..c0dd904483c76ffb4d1d53a4f53ac29974b393cf 100644 (file)
--- a/arch/sh/drivers/dma/dmabrg.c
+++ b/arch/sh/drivers/dma/dmabrg.c
@@ -189,8 +189,8 @@ static int __init dmabrg_init(void)
        if (ret == 0)
                return ret;
 
-       free_irq(DMABRGI1, 0);
-out1:  free_irq(DMABRGI0, 0);
+       free_irq(DMABRGI1, NULL);
+out1:  free_irq(DMABRGI0, NULL);
 out0:  kfree(dmabrg_handlers);
        return ret;
 }