Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 904dbd13 authored by Alan Cox's avatar Alan Cox Committed by Jeff Garzik
Browse files

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: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 4112e16a

drivers/ata/ahci.c

+2 −6
Original line number Diff line number Diff line
@@ -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;

	}