[PATCH] libata: replace pci_module_init() with pci_register_driver()

[linux-2.6] / drivers / scsi / ahci.c

diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index f5734a97580a8396ed046dc2322799b4153337a3..813031c01fbaec9028b91bed5dd1cf8710959ee7 100644 (file)
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -662,14 +662,13 @@ static void ahci_init_controller(void __iomem *mmio, struct pci_dev *pdev,
                VPRINTK("PORT_SCR_ERR 0x%x\n", tmp);
                writel(tmp, port_mmio + PORT_SCR_ERR);
 
-               /* clear & turn off port IRQ */
+               /* clear port IRQ */
                tmp = readl(port_mmio + PORT_IRQ_STAT);
                VPRINTK("PORT_IRQ_STAT 0x%x\n", tmp);
                if (tmp)
                        writel(tmp, port_mmio + PORT_IRQ_STAT);
 
                writel(1 << i, mmio + HOST_IRQ_STAT);
-               writel(0, port_mmio + PORT_IRQ_MASK);
        }
 
        tmp = readl(mmio + HOST_CTL);
@@ -1666,7 +1665,7 @@ static void ahci_remove_one (struct pci_dev *pdev)
 
 static int __init ahci_init(void)
 {
-       return pci_module_init(&ahci_pci_driver);
+       return pci_register_driver(&ahci_pci_driver);
 }
 
 static void __exit ahci_exit(void)