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, 20 insertions, 23 deletions

diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 507eb1ee05f8..a0a650c7f272 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -87,7 +87,6 @@ static struct ata_port_operations pata_platform_port_ops = {
 
         .data_xfer              = ata_data_xfer_noirq,
 
-        .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
         .irq_ack                = ata_irq_ack,
@@ -136,7 +135,8 @@ static void pata_platform_setup_port(struct ata_ioports *ioaddr,
 static int __devinit pata_platform_probe(struct platform_device *pdev)
 {
         struct resource *io_res, *ctl_res;
-        struct ata_probe_ent ae;
+        struct ata_host *host;
+        struct ata_port *ap;
         unsigned int mmio;
 
         /*
@@ -176,44 +176,41 @@ static int __devinit pata_platform_probe(struct platform_device *pdev)
         /*
          * Now that that's out of the way, wire up the port..
          */
-        memset(&ae, 0, sizeof(struct ata_probe_ent));
-        INIT_LIST_HEAD(&ae.node);
-        ae.dev = &pdev->dev;
-        ae.port_ops = &pata_platform_port_ops;
-        ae.sht = &pata_platform_sht;
-        ae.n_ports = 1;
-        ae.pio_mask = pio_mask;
-        ae.irq = platform_get_irq(pdev, 0);
-        ae.irq_flags = 0;
-        ae.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST;
+        host = ata_host_alloc(&pdev->dev, 1);
+        if (!host)
+                return -ENOMEM;
+        ap = host->ports[0];
+
+        ap->ops = &pata_platform_port_ops;
+        ap->pio_mask = pio_mask;
+        ap->flags |= ATA_FLAG_SLAVE_POSS;
 
         /*
          * Handle the MMIO case
          */
         if (mmio) {
-                ae.port[0].cmd_addr = devm_ioremap(&pdev->dev, io_res->start,
+                ap->ioaddr.cmd_addr = devm_ioremap(&pdev->dev, io_res->start,
                                 io_res->end - io_res->start + 1);
-                ae.port[0].ctl_addr = devm_ioremap(&pdev->dev, ctl_res->start,
+                ap->ioaddr.ctl_addr = devm_ioremap(&pdev->dev, ctl_res->start,
                                 ctl_res->end - ctl_res->start + 1);
         } else {
-                ae.port[0].cmd_addr = devm_ioport_map(&pdev->dev, io_res->start,
+                ap->ioaddr.cmd_addr = devm_ioport_map(&pdev->dev, io_res->start,
                                 io_res->end - io_res->start + 1);
-                ae.port[0].ctl_addr = devm_ioport_map(&pdev->dev, ctl_res->start,
+                ap->ioaddr.ctl_addr = devm_ioport_map(&pdev->dev, ctl_res->start,
                                 ctl_res->end - ctl_res->start + 1);
         }
-        if (!ae.port[0].cmd_addr || !ae.port[0].ctl_addr) {
+        if (!ap->ioaddr.cmd_addr || !ap->ioaddr.ctl_addr) {
                 dev_err(&pdev->dev, "failed to map IO/CTL base\n");
                 return -ENOMEM;
         }
 
-        ae.port[0].altstatus_addr = ae.port[0].ctl_addr;
+        ap->ioaddr.altstatus_addr = ap->ioaddr.ctl_addr;
 
-        pata_platform_setup_port(&ae.port[0], pdev->dev.platform_data);
+        pata_platform_setup_port(&ap->ioaddr, pdev->dev.platform_data);
 
-        if (unlikely(ata_device_add(&ae) == 0))
-                return -ENODEV;
-
-        return 0;
+        /* activate */
+        return ata_host_activate(host, platform_get_irq(pdev, 0), ata_interrupt,
+                                 0, &pata_platform_sht);
 }
 
 /**