summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-08-07 11:39:04 +0900
committerJeff Garzik <jeff@garzik.org>2006-08-09 00:13:28 -0400
commitf4b5cc874158a139c091b3decd468929e10645e6 (patch)
tree0ab440ace3cd35ff202e9ee9e3f00e79b91c86c6
parent80289167fd3ebaeb7b2641e69cbec44b61165fe7 (diff)
downloadblackbird-op-linux-f4b5cc874158a139c091b3decd468929e10645e6.tar.gz
blackbird-op-linux-f4b5cc874158a139c091b3decd468929e10645e6.zip
[PATCH] ahci: remove IRQ mask clearing from init_controller()
Initial IRQ mask clearing is done by libata-core by freezing all ports prior to requesting IRQ. Remove redundant IRQ clearing from init_controller(). Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/scsi/ahci.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index f5734a97580a..68fd7667a082 100644
--- 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);
OpenPOWER on IntegriCloud