Merge branch 'master' of /home/sam/kernel/linux-2.6/

[linux-2.6-omap-h63xx.git] / drivers / dma / ioatdma.c

diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index 0fdf7fbd6495833b573d97275648213de0103e60..ecad8f65d2d416faf2f66d38bafe8220230d24a6 100644 (file)
--- a/drivers/dma/ioatdma.c
+++ b/drivers/dma/ioatdma.c
@@ -739,7 +739,7 @@ static int __devinit ioat_probe(struct pci_dev *pdev,
                device->msi = 0;
        }
 #endif
-       err = request_irq(pdev->irq, &ioat_do_interrupt, SA_SHIRQ, "ioat",
+       err = request_irq(pdev->irq, &ioat_do_interrupt, IRQF_SHARED, "ioat",
                device);
        if (err)
                goto err_irq;
@@ -824,10 +824,9 @@ static int __init ioat_init_module(void)
 {
        /* it's currently unsafe to unload this module */
        /* if forced, worst case is that rmmod hangs */
-       if (THIS_MODULE != NULL)
-               THIS_MODULE->unsafe = 1;
+       __unsafe(THIS_MODULE);
 
-       return pci_module_init(&ioat_pci_drv);
+       pci_module_init(&ioat_pci_drv);
 }
 
 module_init(ioat_init_module);