sh: Replace setup_irq() by request_irq()

[sfrench/cifs-2.6.git] / arch / sh / drivers / dma / dma-pvr2.c

diff --git a/arch/sh/drivers/dma/dma-pvr2.c b/arch/sh/drivers/dma/dma-pvr2.c
index b5dbd1f75768b6f3ccc148a3a046ea714dfebc5a..21c347543e193d16f0a535c1e32a05f1625e18af 100644 (file)
--- a/arch/sh/drivers/dma/dma-pvr2.c
+++ b/arch/sh/drivers/dma/dma-pvr2.c
@@ -64,11 +64,6 @@ static int pvr2_xfer_dma(struct dma_channel *chan)
        return 0;
 }
 
-static struct irqaction pvr2_dma_irq = {
-       .name           = "pvr2 DMA handler",
-       .handler        = pvr2_dma_interrupt,
-};
-
 static struct dma_ops pvr2_dma_ops = {
        .request        = pvr2_request_dma,
        .get_residue    = pvr2_get_dma_residue,
@@ -84,7 +79,9 @@ static struct dma_info pvr2_dma_info = {
 
 static int __init pvr2_dma_init(void)
 {
-       setup_irq(HW_EVENT_PVR2_DMA, &pvr2_dma_irq);
+       if (request_irq(HW_EVENT_PVR2_DMA, pvr2_dma_interrupt, 0,
+                       "pvr2 DMA handler", NULL))
+               pr_err("Failed to register pvr2 DMA handler interrupt\n");
        request_dma(PVR2_CASCADE_CHAN, "pvr2 cascade");
 
        return register_dmac(&pvr2_dma_info);