Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 728e0eaf99631d197e5158e21b4a8c4335a39231

Authored by Tejun Heo
Committed by Jeff Garzik
1 parent b429dd5998
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ata_generic: drop hard coded DMA force logic for CENATEK 

Commit 1529c69adc (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: Tejun Heo <tj@kernel.org>
Reported-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

Showing 1 changed file with 0 additions and 4 deletions Side-by-side Diff

drivers/ata/ata_generic.c
Diff comments   View file @ 728e0ea
... ... @@ -54,7 +54,6 @@
54 54 const struct pci_device_id *id = ap->host->private_data;
55 55 int dma_enabled = 0;
56 56 struct ata_device *dev;
57   - struct pci_dev *pdev = to_pci_dev(ap->host->dev);
58 57  
59 58 if (id->driver_data & ATA_GEN_FORCE_DMA) {
60 59 dma_enabled = 0xff;
... ... @@ -62,9 +61,6 @@
62 61 /* Bits 5 and 6 indicate if DMA is active on master/slave */
63 62 dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
64 63 }
65   -
66   - if (pdev->vendor == PCI_VENDOR_ID_CENATEK)
67   - dma_enabled = 0xFF;
68 64  
69 65 ata_for_each_dev(dev, link, ENABLED) {
70 66 /* We don't really care */