Skip to contentSkip to conversation

ahci: Remove jmicron fixup

PATCH Applied Alan 2 participants 2 messages Jan 8, 2007 – Jan 9, 2007 libata

lore
Share & tools
lore

Alan

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
drivers/ata/ahci.c +2 -6
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.20-rc3-mm1/drivers/ata/ahci.c linux-2.6.20-rc3-mm1/drivers/ata/ahci.c
@@ -1659,13 +1659,9 @@
 	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;
 	}
Applied
#1 lore raw
Quoted 5 lines · Alan

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 <[email protected]>

applied