libata: convert the remaining PATA drivers to new init model

Convert pdc_adma, pata_cs5520, pata_isapnp, pata_ixp4xx_cf,
pata_legacy, pata_mpc52xx, pata_mpiix, pata_pcmcia, pata_pdc2027x,
pata_platform, pata_qdi, pata_scc and pata_winbond to new init model.

* init_one()'s now follow more consistent init order

* cs5520 now registers one host with two ports, not two hosts.  If any
  of the two ports are disabled, it's made dummy as other drivers do.

Tested pdc_adma and pata_legacy.  Both are as broken as before.  The
rest are compile tested only.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 17 insertions, 19 deletions

diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index 1718eaca731f..987c5fafab08 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -190,7 +190,6 @@ static struct ata_port_operations mpiix_port_ops = {
         .qc_issue       = mpiix_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,
@@ -201,8 +200,9 @@ static struct ata_port_operations mpiix_port_ops = {
 static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         /* Single threaded by the PCI probe logic */
-        static struct ata_probe_ent probe;
         static int printed_version;
+        struct ata_host *host;
+        struct ata_port *ap;
         void __iomem *cmd_addr, *ctl_addr;
         u16 idetim;
         int irq;
@@ -210,6 +210,10 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &dev->dev, "version " DRV_VERSION "\n");
 
+        host = ata_host_alloc(&dev->dev, 1);
+        if (!host)
+                return -ENOMEM;
+
         /* MPIIX has many functions which can be turned on or off according
            to other devices present. Make sure IDE is enabled before we try
            and use it */
@@ -238,27 +242,21 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
            without BARs set fools the setup.  #2 If you pci_disable_device
            the MPIIX your box goes castors up */
 
-        INIT_LIST_HEAD(&probe.node);
-        probe.dev = pci_dev_to_dev(dev);
-        probe.port_ops = &mpiix_port_ops;
-        probe.sht = &mpiix_sht;
-        probe.pio_mask = 0x1F;
-        probe.irq_flags = IRQF_SHARED;
-        probe.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST;
-        probe.n_ports = 1;
+        ap = host->ports[0];
+        ap->ops = &mpiix_port_ops;
+        ap->pio_mask = 0x1F;
+        ap->flags |= ATA_FLAG_SLAVE_POSS;
 
-        probe.irq = irq;
-        probe.port[0].cmd_addr = cmd_addr;
-        probe.port[0].ctl_addr = ctl_addr;
-        probe.port[0].altstatus_addr = ctl_addr;
+        ap->ioaddr.cmd_addr = cmd_addr;
+        ap->ioaddr.ctl_addr = ctl_addr;
+        ap->ioaddr.altstatus_addr = ctl_addr;
 
         /* Let libata fill in the port details */
-        ata_std_ports(&probe.port[0]);
+        ata_std_ports(&ap->ioaddr);
 
-        /* Now add the port that is active */
-        if (ata_device_add(&probe))
-                return 0;
-        return -ENODEV;
+        /* activate host */
+        return ata_host_activate(host, irq, ata_interrupt, IRQF_SHARED,
+                                 &mpiix_sht);
 }
 
 static const struct pci_device_id mpiix[] = {