summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-10-09 14:59:50 +0900
committerJeff Garzik <jeff@garzik.org>2007-10-12 14:55:46 -0400
commit75da6d2b8f518bec40546bc0b0696a2cebecf6cc (patch)
tree2ee776da78cfc3dd9a42ebcfdc7864248982159f
parent9073868376ed5fa1f247327ccb2e6f766d5b7eed (diff)
downloadop-kernel-dev-75da6d2b8f518bec40546bc0b0696a2cebecf6cc.zip
op-kernel-dev-75da6d2b8f518bec40546bc0b0696a2cebecf6cc.tar.gz
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>
-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 24fb90f..694eabc 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1677,19 +1677,11 @@ static void ahci_pmp_attach(struct ata_port *ap)
static void ahci_pmp_detach(struct ata_port *ap)
{
void __iomem *port_mmio = ahci_port_base(ap);
- struct ahci_host_priv *hpriv = ap->host->private_data;
- unsigned long flags;
u32 cmd;
cmd = readl(port_mmio + PORT_CMD);
cmd &= ~PORT_CMD_PMP;
writel(cmd, port_mmio + PORT_CMD);
-
- if (hpriv->cap & HOST_CAP_NCQ) {
- spin_lock_irqsave(ap->lock, flags);
- ap->flags |= ATA_FLAG_NCQ;
- spin_unlock_irqrestore(ap->lock, flags);
- }
}
static int ahci_pmp_read(struct ata_device *dev, int pmp, int reg, u32 *r_val)
OpenPOWER on IntegriCloud