diff options
author | Tejun Heo <htejun@gmail.com> | 2006-08-06 22:39:04 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-09 00:13:28 -0400 |
commit | f4b5cc874158a139c091b3decd468929e10645e6 (patch) | |
tree | 0ab440ace3cd35ff202e9ee9e3f00e79b91c86c6 | |
parent | 80289167fd3ebaeb7b2641e69cbec44b61165fe7 (diff) |
[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.c | 3 |
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, | |||
662 | VPRINTK("PORT_SCR_ERR 0x%x\n", tmp); | 662 | VPRINTK("PORT_SCR_ERR 0x%x\n", tmp); |
663 | writel(tmp, port_mmio + PORT_SCR_ERR); | 663 | writel(tmp, port_mmio + PORT_SCR_ERR); |
664 | 664 | ||
665 | /* clear & turn off port IRQ */ | 665 | /* clear port IRQ */ |
666 | tmp = readl(port_mmio + PORT_IRQ_STAT); | 666 | tmp = readl(port_mmio + PORT_IRQ_STAT); |
667 | VPRINTK("PORT_IRQ_STAT 0x%x\n", tmp); | 667 | VPRINTK("PORT_IRQ_STAT 0x%x\n", tmp); |
668 | if (tmp) | 668 | if (tmp) |
669 | writel(tmp, port_mmio + PORT_IRQ_STAT); | 669 | writel(tmp, port_mmio + PORT_IRQ_STAT); |
670 | 670 | ||
671 | writel(1 << i, mmio + HOST_IRQ_STAT); | 671 | writel(1 << i, mmio + HOST_IRQ_STAT); |
672 | writel(0, port_mmio + PORT_IRQ_MASK); | ||
673 | } | 672 | } |
674 | 673 | ||
675 | tmp = readl(mmio + HOST_CTL); | 674 | tmp = readl(mmio + HOST_CTL); |