From d0e3c6d3bc426c10f60f157fa40fcd7f3e622d54 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 9 Oct 2007 14:59:50 +0900 Subject: [PATCH] --- yaml --- r: 68161 b: refs/heads/master c: 75da6d2b8f518bec40546bc0b0696a2cebecf6cc h: refs/heads/master i: 68159: ef5704c6bf2c1389a6c98f39188aafd307917268 v: v3 --- [refs] | 2 +- trunk/drivers/ata/ahci.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index e7ff535e7639..9ad2d8dcc0f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9073868376ed5fa1f247327ccb2e6f766d5b7eed +refs/heads/master: 75da6d2b8f518bec40546bc0b0696a2cebecf6cc diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c index 24fb90f58cd1..694eabcb932f 100644 --- a/trunk/drivers/ata/ahci.c +++ b/trunk/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)