Patchwork ahci_gtf_filter_workaround function breaks current git build

login
register
mail settings
Submitter Markus Trippelsdorf
Date Oct. 9, 2009, 3:41 a.m.
Message ID <20091009034147.GA1985@phenom2.trippelsdorf.de>
Download mbox | patch
Permalink /patch/35552/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Markus Trippelsdorf - Oct. 9, 2009, 3:41 a.m.
ahci: Add ifdef wrapper to ahci_gtf_filter_workaround

Commit f80ae7e45a0e03da188494c6e947a5c8b0cdfb4a 
ahci: filter FPDMA non-zero offset enable for Aspire 3810T 
breaks the current git build for configurations that don't define
CONFIG_ATA_ACPI.  
This adds an ifdef wrapper to ahci_gtf_filter_workaround.

Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Tejun Heo - Oct. 9, 2009, 4 a.m.
Markus Trippelsdorf wrote:
> ahci: Add ifdef wrapper to ahci_gtf_filter_workaround
> 
> Commit f80ae7e45a0e03da188494c6e947a5c8b0cdfb4a 
> ahci: filter FPDMA non-zero offset enable for Aspire 3810T 
> breaks the current git build for configurations that don't define
> CONFIG_ATA_ACPI.  
> This adds an ifdef wrapper to ahci_gtf_filter_workaround.
> 
> Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>

Acked-by: Tejun Heo <tj@kernel.org>

Thank you.
Jeff Garzik - Oct. 9, 2009, 4:30 a.m.
On 10/08/2009 11:41 PM, Markus Trippelsdorf wrote:
> ahci: Add ifdef wrapper to ahci_gtf_filter_workaround
>
> Commit f80ae7e45a0e03da188494c6e947a5c8b0cdfb4a
> ahci: filter FPDMA non-zero offset enable for Aspire 3810T
> breaks the current git build for configurations that don't define
> CONFIG_ATA_ACPI.
> This adds an ifdef wrapper to ahci_gtf_filter_workaround.
>
> Signed-off-by: Markus Trippelsdorf<markus@trippelsdorf.de>

applied


--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 4edca6e..b1a2577 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -2884,6 +2884,7 @@  static bool ahci_broken_online(struct pci_dev *pdev)
 	return pdev->bus->number == (val >> 8) && pdev->devfn == (val & 0xff);
 }
 
+#ifdef CONFIG_ATA_ACPI
 static void ahci_gtf_filter_workaround(struct ata_host *host)
 {
 	static const struct dmi_system_id sysids[] = {
@@ -2927,6 +2928,10 @@  static void ahci_gtf_filter_workaround(struct ata_host *host)
 				dev->gtf_filter |= filter;
 	}
 }
+#else
+static inline void ahci_gtf_filter_workaround(struct ata_host *host)
+{}
+#endif
 
 static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {