From: Alan Date: Mon, 8 Jan 2007 12:07:25 +0000 (+0000) Subject: ahci: Remove jmicron fixup X-Git-Tag: v2.6.21-rc1~274^2~528 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=904dbd1307100edc12e2f98dd12b2338f1914f5b;p=linux-2.6 ahci: Remove jmicron fixup The AHCI set up is handled properly along with the other bits in the JMICRON quirk. Remove the code whacking it in ahci.c as its un-needed and also blindly fiddles with bits it doesn't own. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 32cfaa89dc..ca53d5a9c0 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1685,13 +1685,9 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) if (!printed_version++) dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); - /* JMicron-specific fixup: make sure we're in AHCI mode */ - /* This is protected from races with ata_jmicron by the pci probe - locking */ if (pdev->vendor == PCI_VENDOR_ID_JMICRON) { - /* AHCI enable, AHCI on function 0 */ - pci_write_config_byte(pdev, 0x41, 0xa1); - /* Function 1 is the PATA controller */ + /* Function 1 is the PATA controller except on the 368, where + we are not AHCI anyway */ if (PCI_FUNC(pdev->devfn)) return -ENODEV; }