[PATCH] ext4: 48bit i_file_acl

[powerpc.git] / drivers / ata / pata_via.c

diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 2580e16..1e7be9e 100644 (file)
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -60,7 +60,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_via"
-#define DRV_VERSION "0.1.13"
+#define DRV_VERSION "0.1.14"
 
 /*
  *     The following comes directly from Vojtech Pavlik's ide/pci/via82cxxx
@@ -154,12 +154,9 @@ static int via_pre_reset(struct ata_port *ap)
                };
 
                struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-               
-               if (!pci_test_config_bits(pdev, &via_enable_bits[ap->port_no])) {
-                       ata_port_disable(ap);
-                       printk(KERN_INFO "ata%u: port disabled. ignoring.\n", ap->id);
-                       return 0;
-               }
+
+               if (!pci_test_config_bits(pdev, &via_enable_bits[ap->port_no]))
+                       return -ENOENT;
        }
 
        if ((config->flags & VIA_UDMA) >= VIA_UDMA_66)
@@ -325,7 +322,7 @@ static struct ata_port_operations via_port_ops = {
 
        .qc_prep        = ata_qc_prep,
        .qc_issue       = ata_qc_issue_prot,
-       .eng_timeout    = ata_eng_timeout,
+
        .data_xfer      = ata_pio_data_xfer,
 
        .irq_handler    = ata_interrupt,
@@ -360,7 +357,7 @@ static struct ata_port_operations via_port_ops_noirq = {
 
        .qc_prep        = ata_qc_prep,
        .qc_issue       = ata_qc_issue_prot,
-       .eng_timeout    = ata_eng_timeout,
+
        .data_xfer      = ata_pio_data_xfer_noirq,
 
        .irq_handler    = ata_interrupt,
@@ -532,15 +529,16 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 }
 
 static const struct pci_device_id via[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C576_1), },
-       { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1), },
-       { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_6410), },
-       { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_SATA_EIDE), },
-       { 0, },
+       { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C576_1), },
+       { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C586_1), },
+       { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_6410), },
+       { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_SATA_EIDE), },
+
+       { },
 };
 
 static struct pci_driver via_pci_driver = {
-        .name          = DRV_NAME,
+       .name           = DRV_NAME,
        .id_table       = via,
        .probe          = via_init_one,
        .remove         = ata_pci_remove_one
@@ -551,13 +549,11 @@ static int __init via_init(void)
        return pci_register_driver(&via_pci_driver);
 }
 
-
 static void __exit via_exit(void)
 {
        pci_unregister_driver(&via_pci_driver);
 }
 
-
 MODULE_AUTHOR("Alan Cox");
 MODULE_DESCRIPTION("low-level driver for VIA PATA");
 MODULE_LICENSE("GPL");