aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-10-09 01:59:50 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-12 14:55:46 -0400
commit75da6d2b8f518bec40546bc0b0696a2cebecf6cc (patch)
tree2ee776da78cfc3dd9a42ebcfdc7864248982159f /drivers
parent9073868376ed5fa1f247327ccb2e6f766d5b7eed (diff)
ahci: kill leftover from enabling NCQ over PMP
ahci had problems with NCQ over PMP and NCQ used to be disabled while PMP was attached. After fixing the problem, the temporary NCQ disabling code wasn't removed completely. Kill the remaining piece. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/ahci.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 24fb90f58cd1..694eabcb932f 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1677,19 +1677,11 @@ static void ahci_pmp_attach(struct ata_port *ap)
1677static void ahci_pmp_detach(struct ata_port *ap) 1677static void ahci_pmp_detach(struct ata_port *ap)
1678{ 1678{
1679 void __iomem *port_mmio = ahci_port_base(ap); 1679 void __iomem *port_mmio = ahci_port_base(ap);
1680 struct ahci_host_priv *hpriv = ap->host->private_data;
1681 unsigned long flags;
1682 u32 cmd; 1680 u32 cmd;
1683 1681
1684 cmd = readl(port_mmio + PORT_CMD); 1682 cmd = readl(port_mmio + PORT_CMD);
1685 cmd &= ~PORT_CMD_PMP; 1683 cmd &= ~PORT_CMD_PMP;
1686 writel(cmd, port_mmio + PORT_CMD); 1684 writel(cmd, port_mmio + PORT_CMD);
1687
1688 if (hpriv->cap & HOST_CAP_NCQ) {
1689 spin_lock_irqsave(ap->lock, flags);
1690 ap->flags |= ATA_FLAG_NCQ;
1691 spin_unlock_irqrestore(ap->lock, flags);
1692 }
1693} 1685}
1694 1686
1695static int ahci_pmp_read(struct ata_device *dev, int pmp, int reg, u32 *r_val) 1687static int ahci_pmp_read(struct ata_device *dev, int pmp, int reg, u32 *r_val)