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

Commit 728e0eaf authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

ata_generic: drop hard coded DMA force logic for CENATEK 



Commit 1529c69a (ata_generic: implement ATA_GEN_* flags and force
enable DMA on MBP 7,1) implemented ATA_GEN_FORCE_DMA for forcing DMA
mode and applied it to CENATEK but forgot to remove the original hard
coded logic.  This is removal of redundant logic and doesn't affect
correctness.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarAndy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent b429dd59

drivers/ata/ata_generic.c

+0 −4
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused) 
	const struct pci_device_id *id = ap->host->private_data;

	int dma_enabled = 0;

	struct ata_device *dev;

	struct pci_dev *pdev = to_pci_dev(ap->host->dev);



	if (id->driver_data & ATA_GEN_FORCE_DMA) {

		dma_enabled = 0xff;
@@ -63,9 +62,6 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused) 
		dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);

	}



	if (pdev->vendor == PCI_VENDOR_ID_CENATEK)

		dma_enabled = 0xFF;



	ata_for_each_dev(dev, link, ENABLED) {

		/* We don't really care */

		dev->pio_mode = XFER_PIO_0;