1 files changed, 73 insertions, 72 deletions

diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 55cc293e7487..79bef0d1fad3 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -139,18 +139,6 @@ static void cs5520_set_piomode(struct ata_port *ap, struct ata_device *adev)
         cs5520_set_timings(ap, adev, adev->pio_mode);
 }
 
-
-static int cs5520_pre_reset(struct ata_port *ap)
-{
-        ap->cbl = ATA_CBL_PATA40;
-        return ata_std_prereset(ap);
-}
-
-static void cs5520_error_handler(struct ata_port *ap)
-{
-        return ata_bmdma_drive_eh(ap, cs5520_pre_reset, ata_std_softreset, NULL, ata_std_postreset);
-}
-
 static struct scsi_host_template cs5520_sht = {
         .module                 = THIS_MODULE,
         .name                   = DRV_NAME,
@@ -186,8 +174,9 @@ static struct ata_port_operations cs5520_port_ops = {
 
         .freeze                 = ata_bmdma_freeze,
         .thaw                   = ata_bmdma_thaw,
-        .error_handler          = cs5520_error_handler,
+        .error_handler          = ata_bmdma_error_handler,
         .post_internal_cmd      = ata_bmdma_post_internal_cmd,
+        .cable_detect           = ata_cable_40wire,
 
         .bmdma_setup            = ata_bmdma_setup,
         .bmdma_start            = ata_bmdma_start,
@@ -197,7 +186,6 @@ static struct ata_port_operations cs5520_port_ops = {
         .qc_issue               = ata_qc_issue_prot,
         .data_xfer              = ata_data_xfer,
 
-        .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
         .irq_ack                = ata_irq_ack,
@@ -205,91 +193,104 @@ static struct ata_port_operations cs5520_port_ops = {
         .port_start             = ata_port_start,
 };
 
-static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id)
+static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
+        struct ata_port_info pi = {
+                .flags          = ATA_FLAG_SLAVE_POSS,
+                .pio_mask       = 0x1f,
+                .port_ops       = &cs5520_port_ops,
+        };
+        const struct ata_port_info *ppi[2];
         u8 pcicfg;
-        void __iomem *iomap[5];
-        static struct ata_probe_ent probe[2];
-        int ports = 0;
+        void *iomap[5];
+        struct ata_host *host;
+        struct ata_ioports *ioaddr;
+        int i, rc;
 
         /* IDE port enable bits */
-        pci_read_config_byte(dev, 0x60, &pcicfg);
+        pci_read_config_byte(pdev, 0x60, &pcicfg);
 
         /* Check if the ATA ports are enabled */
         if ((pcicfg & 3) == 0)
                 return -ENODEV;
 
+        ppi[0] = ppi[1] = &ata_dummy_port_info;
+        if (pcicfg & 1)
+                ppi[0] = π
+        if (pcicfg & 2)
+                ppi[1] = π
+
         if ((pcicfg & 0x40) == 0) {
-                printk(KERN_WARNING DRV_NAME ": DMA mode disabled. Enabling.\n");
-                pci_write_config_byte(dev, 0x60, pcicfg | 0x40);
+                dev_printk(KERN_WARNING, &pdev->dev,
+                           "DMA mode disabled. Enabling.\n");
+                pci_write_config_byte(pdev, 0x60, pcicfg | 0x40);
         }
 
+        pi.mwdma_mask = id->driver_data;
+
+        host = ata_host_alloc_pinfo(&pdev->dev, ppi, 2);
+        if (!host)
+                return -ENOMEM;
+
         /* Perform set up for DMA */
-        if (pci_enable_device_bars(dev, 1<<2)) {
+        if (pci_enable_device_bars(pdev, 1<<2)) {
                 printk(KERN_ERR DRV_NAME ": unable to configure BAR2.\n");
                 return -ENODEV;
         }
-        pci_set_master(dev);
-        if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
+
+        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                 printk(KERN_ERR DRV_NAME ": unable to configure DMA mask.\n");
                 return -ENODEV;
         }
-        if (pci_set_consistent_dma_mask(dev, DMA_32BIT_MASK)) {
+        if (pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) {
                 printk(KERN_ERR DRV_NAME ": unable to configure consistent DMA mask.\n");
                 return -ENODEV;
         }
 
-        /* Map IO ports */
-        iomap[0] = devm_ioport_map(&dev->dev, 0x1F0, 8);
-        iomap[1] = devm_ioport_map(&dev->dev, 0x3F6, 1);
-        iomap[2] = devm_ioport_map(&dev->dev, 0x170, 8);
-        iomap[3] = devm_ioport_map(&dev->dev, 0x376, 1);
-        iomap[4] = pcim_iomap(dev, 2, 0);
+        /* Map IO ports and initialize host accordingly */
+        iomap[0] = devm_ioport_map(&pdev->dev, 0x1F0, 8);
+        iomap[1] = devm_ioport_map(&pdev->dev, 0x3F6, 1);
+        iomap[2] = devm_ioport_map(&pdev->dev, 0x170, 8);
+        iomap[3] = devm_ioport_map(&pdev->dev, 0x376, 1);
+        iomap[4] = pcim_iomap(pdev, 2, 0);
 
         if (!iomap[0] || !iomap[1] || !iomap[2] || !iomap[3] || !iomap[4])
                 return -ENOMEM;
 
-        /* We have to do our own plumbing as the PCI setup for this
-           chipset is non-standard so we can't punt to the libata code */
-
-        INIT_LIST_HEAD(&probe[0].node);
-        probe[0].dev = pci_dev_to_dev(dev);
-        probe[0].port_ops = &cs5520_port_ops;
-        probe[0].sht = &cs5520_sht;
-        probe[0].pio_mask = 0x1F;
-        probe[0].mwdma_mask = id->driver_data;
-        probe[0].irq = 14;
-        probe[0].irq_flags = 0;
-        probe[0].port_flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST;
-        probe[0].n_ports = 1;
-        probe[0].port[0].cmd_addr = iomap[0];
-        probe[0].port[0].ctl_addr = iomap[1];
-        probe[0].port[0].altstatus_addr = iomap[1];
-        probe[0].port[0].bmdma_addr = iomap[4];
-
-        /* The secondary lurks at different addresses but is otherwise
-           the same beastie */
-
-        probe[1] = probe[0];
-        INIT_LIST_HEAD(&probe[1].node);
-        probe[1].irq = 15;
-        probe[1].port[0].cmd_addr = iomap[2];
-        probe[1].port[0].ctl_addr = iomap[3];
-        probe[1].port[0].altstatus_addr = iomap[3];
-        probe[1].port[0].bmdma_addr = iomap[4] + 8;
-
-        /* Let libata fill in the port details */
-        ata_std_ports(&probe[0].port[0]);
-        ata_std_ports(&probe[1].port[0]);
-
-        /* Now add the ports that are active */
-        if (pcicfg & 1)
-                ports += ata_device_add(&probe[0]);
-        if (pcicfg & 2)
-                ports += ata_device_add(&probe[1]);
-        if (ports)
-                return 0;
-        return -ENODEV;
+        ioaddr = &host->ports[0]->ioaddr;
+        ioaddr->cmd_addr = iomap[0];
+        ioaddr->ctl_addr = iomap[1];
+        ioaddr->altstatus_addr = iomap[1];
+        ioaddr->bmdma_addr = iomap[4];
+        ata_std_ports(ioaddr);
+
+        ioaddr = &host->ports[1]->ioaddr;
+        ioaddr->cmd_addr = iomap[2];
+        ioaddr->ctl_addr = iomap[3];
+        ioaddr->altstatus_addr = iomap[3];
+        ioaddr->bmdma_addr = iomap[4] + 8;
+        ata_std_ports(ioaddr);
+
+        /* activate the host */
+        pci_set_master(pdev);
+        rc = ata_host_start(host);
+        if (rc)
+                return rc;
+
+        for (i = 0; i < 2; i++) {
+                static const int irq[] = { 14, 15 };
+                struct ata_port *ap = host->ports[0];
+
+                if (ata_port_is_dummy(ap))
+                        continue;
+
+                rc = devm_request_irq(&pdev->dev, irq[ap->port_no],
+                                      ata_interrupt, 0, DRV_NAME, host);
+                if (rc)
+                        return rc;
+        }
+
+        return ata_host_register(host, &cs5520_sht);
 }
 
 /**