pata_hpt3x2n: fix cable detection

[safe/jmp/linux-2.6] / drivers / ata / pata_sil680.c

diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 0936f53..4cb649d 100644 (file)
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -1,7 +1,6 @@
 /*
  * pata_sil680.c       - SIL680 PATA for new ATA layer
  *                       (C) 2005 Red Hat Inc
- *                       Alan Cox <alan@redhat.com>
  *
  * based upon
  *
@@ -33,7 +32,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_sil680"
-#define DRV_VERSION "0.4.8"
+#define DRV_VERSION "0.4.9"
 
 #define SIL680_MMIO_BAR                5
 
@@ -196,7 +195,7 @@ static struct scsi_host_template sil680_sht = {
 };
 
 static struct ata_port_operations sil680_port_ops = {
-       .inherits       = &ata_bmdma_port_ops,
+       .inherits       = &ata_bmdma32_port_ops,
        .cable_detect   = sil680_cable_detect,
        .set_piomode    = sil680_set_piomode,
        .set_dmamode    = sil680_set_dmamode,
@@ -230,7 +229,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
                tmpbyte & 1, tmpbyte & 0x30);
 
        *try_mmio = 0;
-#ifdef CONFIG_PPC_MERGE
+#ifdef CONFIG_PPC
        if (machine_is(cell))
                *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);
 #endif
@@ -282,18 +281,16 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,
                                     const struct pci_device_id *id)
 {
        static const struct ata_port_info info = {
-               .sht = &sil680_sht,
                .flags = ATA_FLAG_SLAVE_POSS,
-               .pio_mask = 0x1f,
-               .mwdma_mask = 0x07,
+               .pio_mask = ATA_PIO4,
+               .mwdma_mask = ATA_MWDMA2,
                .udma_mask = ATA_UDMA6,
                .port_ops = &sil680_port_ops
        };
        static const struct ata_port_info info_slow = {
-               .sht = &sil680_sht,
                .flags = ATA_FLAG_SLAVE_POSS,
-               .pio_mask = 0x1f,
-               .mwdma_mask = 0x07,
+               .pio_mask = ATA_PIO4,
+               .mwdma_mask = ATA_MWDMA2,
                .udma_mask = ATA_UDMA5,
                .port_ops = &sil680_port_ops
        };
@@ -324,9 +321,6 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,
        /* Try to acquire MMIO resources and fallback to PIO if
         * that fails
         */
-       rc = pcim_enable_device(pdev);
-       if (rc)
-               return rc;
        rc = pcim_iomap_regions(pdev, 1 << SIL680_MMIO_BAR, DRV_NAME);
        if (rc)
                goto use_ioports;
@@ -352,19 +346,19 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,
        host->ports[0]->ioaddr.cmd_addr = mmio_base + 0x80;
        host->ports[0]->ioaddr.ctl_addr = mmio_base + 0x8a;
        host->ports[0]->ioaddr.altstatus_addr = mmio_base + 0x8a;
-       ata_std_ports(&host->ports[0]->ioaddr);
+       ata_sff_std_ports(&host->ports[0]->ioaddr);
        host->ports[1]->ioaddr.bmdma_addr = mmio_base + 0x08;
        host->ports[1]->ioaddr.cmd_addr = mmio_base + 0xc0;
        host->ports[1]->ioaddr.ctl_addr = mmio_base + 0xca;
        host->ports[1]->ioaddr.altstatus_addr = mmio_base + 0xca;
-       ata_std_ports(&host->ports[1]->ioaddr);
+       ata_sff_std_ports(&host->ports[1]->ioaddr);
 
        /* Register & activate */
-       return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED,
-                                &sil680_sht);
+       return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
+                                IRQF_SHARED, &sil680_sht);
 
 use_ioports:
-       return ata_pci_init_one(pdev, ppi);
+       return ata_pci_sff_init_one(pdev, ppi, &sil680_sht, NULL);
 }
 
 #ifdef CONFIG_PM