libata,pata_via: revert ata_wait_idle() removal from ata_sff/via_tf_load()

[linux-beck.git] / drivers / ata / pata_via.c

diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 741e7cb69d8c269adc9d2f1f4815726cd8dee260..ac8d7d97e4085d4122b33fbd58bde6951f3ef2e7 100644 (file)
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -355,7 +355,7 @@ static unsigned long via_mode_filter(struct ata_device *dev, unsigned long mask)
                        mask &= ~ ATA_MASK_UDMA;
                }
        }
-       return ata_bmdma_mode_filter(dev, mask);
+       return mask;
 }
 
 /**
@@ -426,7 +426,7 @@ static int via_port_start(struct ata_port *ap)
        struct via_port *vp;
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
 
-       int ret = ata_sff_port_start(ap);
+       int ret = ata_bmdma_port_start(ap);
        if (ret < 0)
                return ret;
 
@@ -629,7 +629,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
        }
 
        /* We have established the device type, now fire it up */
-       return ata_pci_sff_init_one(pdev, ppi, &via_sht, (void *)config, 0);
+       return ata_pci_bmdma_init_one(pdev, ppi, &via_sht, (void *)config, 0);
 }
 
 #ifdef CONFIG_PM