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, 19 insertions, 19 deletions

diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index 0b1749a84df2..707099291e01 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -716,7 +716,8 @@ static struct ata_port_operations opti82c46x_port_ops = {
 static __init int legacy_init_one(int port, unsigned long io, unsigned long ctrl, int irq)
 {
         struct legacy_data *ld = &legacy_data[nr_legacy_host];
-        struct ata_probe_ent ae;
+        struct ata_host *host;
+        struct ata_port *ap;
         struct platform_device *pdev;
         struct ata_port_operations *ops = &legacy_port_ops;
         void __iomem *io_addr, *ctrl_addr;
@@ -798,24 +799,23 @@ static __init int legacy_init_one(int port, unsigned long io, unsigned long ctrl
         if (ops == &legacy_port_ops && (autospeed & mask))
                 ops = &simple_port_ops;
 
-        memset(&ae, 0, sizeof(struct ata_probe_ent));
-        INIT_LIST_HEAD(&ae.node);
-        ae.dev = &pdev->dev;
-        ae.port_ops = ops;
-        ae.sht = &legacy_sht;
-        ae.n_ports = 1;
-        ae.pio_mask = pio_modes;
-        ae.irq = irq;
-        ae.irq_flags = 0;
-        ae.port_flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST|iordy;
-        ae.port[0].cmd_addr = io_addr;
-        ae.port[0].altstatus_addr = ctrl_addr;
-        ae.port[0].ctl_addr = ctrl_addr;
-        ata_std_ports(&ae.port[0]);
-        ae.private_data = ld;
-
-        ret = -ENODEV;
-        if (!ata_device_add(&ae))
+        ret = -ENOMEM;
+        host = ata_host_alloc(&pdev->dev, 1);
+        if (!host)
+                goto fail;
+        ap = host->ports[0];
+
+        ap->ops = ops;
+        ap->pio_mask = pio_modes;
+        ap->flags |= ATA_FLAG_SLAVE_POSS | iordy;
+        ap->ioaddr.cmd_addr = io_addr;
+        ap->ioaddr.altstatus_addr = ctrl_addr;
+        ap->ioaddr.ctl_addr = ctrl_addr;
+        ata_std_ports(&ap->ioaddr);
+        ap->private_data = ld;
+
+        ret = ata_host_activate(host, irq, ata_interrupt, 0, &legacy_sht);
+        if (ret)
                 goto fail;
 
         legacy_host[nr_legacy_host++] = dev_get_drvdata(&pdev->dev);