* [PATCH #upstream] ata_generic: drop hard coded DMA force logic for CENATEK
@ 2010-07-02 12:41 Tejun Heo
2010-07-14 7:52 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Tejun Heo @ 2010-07-02 12:41 UTC (permalink / raw)
To: Jeff Garzik, linux-ide@vger.kernel.org, Andy Whitcroft
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>
---
drivers/ata/ata_generic.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 7107a69..cc5f772 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH #upstream] ata_generic: drop hard coded DMA force logic for CENATEK
2010-07-02 12:41 [PATCH #upstream] ata_generic: drop hard coded DMA force logic for CENATEK Tejun Heo
@ 2010-07-14 7:52 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2010-07-14 7:52 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-ide@vger.kernel.org, Andy Whitcroft
On 07/02/2010 08:41 AM, Tejun Heo wrote:
> 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>
> ---
> drivers/ata/ata_generic.c | 4 ----
> 1 file changed, 4 deletions(-)
applied
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-14 7:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-02 12:41 [PATCH #upstream] ata_generic: drop hard coded DMA force logic for CENATEK Tejun Heo
2010-07-14 7:52 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).