projects / pve-kernel-2.6.32.git / blame
| Commit | Line | Data |
|---|---|---|
| e4de4890 DM |
1 | commit 728e0eaf99631d197e5158e21b4a8c4335a39231 |
| 2 | Author: Tejun Heo <tj@kernel.org> | |
| 3 | Date: Fri Jul 2 14:41:24 2010 +0200 | |
| 4 | ||
| 5 | ata_generic: drop hard coded DMA force logic for CENATEK | |
| 6 | ||
| 7 | Commit 1529c69adc (ata_generic: implement ATA_GEN_* flags and force | |
| 8 | enable DMA on MBP 7,1) implemented ATA_GEN_FORCE_DMA for forcing DMA | |
| 9 | mode and applied it to CENATEK but forgot to remove the original hard | |
| 10 | coded logic. This is removal of redundant logic and doesn't affect | |
| 11 | correctness. | |
| 12 | ||
| 13 | Signed-off-by: Tejun Heo <tj@kernel.org> | |
| 14 | Reported-by: Andy Whitcroft <apw@canonical.com> | |
| 15 | Signed-off-by: Jeff Garzik <jgarzik@redhat.com> | |
| 16 | ||
| 17 | diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c | |
| 18 | index 7107a69..cc5f772 100644 | |
| 19 | --- a/drivers/ata/ata_generic.c | |
| 20 | +++ b/drivers/ata/ata_generic.c | |
| 21 | @@ -54,7 +54,6 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused) | |
| 22 | const struct pci_device_id *id = ap->host->private_data; | |
| 23 | int dma_enabled = 0; | |
| 24 | struct ata_device *dev; | |
| 25 | - struct pci_dev *pdev = to_pci_dev(ap->host->dev); | |
| 26 | ||
| 27 | if (id->driver_data & ATA_GEN_FORCE_DMA) { | |
| 28 | dma_enabled = 0xff; | |
| 29 | @@ -63,9 +62,6 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused) | |
| 30 | dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS); | |
| 31 | } | |
| 32 | ||
| 33 | - if (pdev->vendor == PCI_VENDOR_ID_CENATEK) | |
| 34 | - dma_enabled = 0xFF; | |
| 35 | - | |
| 36 | ata_for_each_dev(dev, link, ENABLED) { | |
| 37 | /* We don't really care */ | |
| 38 | dev->pio_mode = XFER_PIO_0; |