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

diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 171da0aeb65f..75dc84797ff3 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -125,7 +125,6 @@ static struct ata_port_operations pcmcia_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,
@@ -146,7 +145,8 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
 static int pcmcia_init_one(struct pcmcia_device *pdev)
 {
-        struct ata_probe_ent ae;
+        struct ata_host *host;
+        struct ata_port *ap;
         struct ata_pcmcia_info *info;
         tuple_t tuple;
         struct {
@@ -290,24 +290,24 @@ next_entry:
          *      Having done the PCMCIA plumbing the ATA side is relatively
          *      sane.
          */
-
-        memset(&ae, 0, sizeof(struct ata_probe_ent));
-        INIT_LIST_HEAD(&ae.node);
-        ae.dev = &pdev->dev;
-        ae.port_ops = &pcmcia_port_ops;
-        ae.sht = &pcmcia_sht;
-        ae.n_ports = 1;
-        ae.pio_mask = 1;                /* ISA so PIO 0 cycles */
-        ae.irq = pdev->irq.AssignedIRQ;
-        ae.irq_flags = IRQF_SHARED;
-        ae.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST;
-        ae.port[0].cmd_addr = io_addr;
-        ae.port[0].altstatus_addr = ctl_addr;
-        ae.port[0].ctl_addr = ctl_addr;
-        ata_std_ports(&ae.port[0]);
-
-        ret = -ENODEV;
-        if (ata_device_add(&ae) == 0)
+        ret = -ENOMEM;
+        host = ata_host_alloc(&pdev->dev, 1);
+        if (!host)
+                goto failed;
+        ap = host->ports[0];
+
+        ap->ops = &pcmcia_port_ops;
+        ap->pio_mask = 1;               /* ISA so PIO 0 cycles */
+        ap->flags |= ATA_FLAG_SLAVE_POSS;
+        ap->ioaddr.cmd_addr = io_addr;
+        ap->ioaddr.altstatus_addr = ctl_addr;
+        ap->ioaddr.ctl_addr = ctl_addr;
+        ata_std_ports(&ap->ioaddr);
+
+        /* activate */
+        ret = ata_host_activate(host, pdev->irq.AssignedIRQ, ata_interrupt,
+                                IRQF_SHARED, &pcmcia_sht);
+        if (ret)
                 goto failed;
 
         info->ndev = 1;