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, 21 insertions, 25 deletions

diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 77b57321ff52..9587a89f9683 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -301,35 +301,33 @@ static struct ata_port_operations mpc52xx_ata_port_ops = {
         .qc_prep                = ata_qc_prep,
         .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,
         .port_start             = ata_port_start,
 };
 
-static struct ata_probe_ent mpc52xx_ata_probe_ent = {
-        .port_ops       = &mpc52xx_ata_port_ops,
-        .sht            = &mpc52xx_ata_sht,
-        .n_ports        = 1,
-        .pio_mask       = 0x1f,         /* Up to PIO4 */
-        .mwdma_mask     = 0x00,         /* No MWDMA   */
-        .udma_mask      = 0x00,         /* No UDMA    */
-        .port_flags     = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
-        .irq_flags      = 0,
-};
-
 static int __devinit
 mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv)
 {
-        struct ata_probe_ent *ae = &mpc52xx_ata_probe_ent;
-        struct ata_ioports *aio = &ae->port[0];
-        int rv;
-
-        INIT_LIST_HEAD(&ae->node);
-        ae->dev = dev;
-        ae->irq = priv->ata_irq;
-
+        struct ata_host *host;
+        struct ata_port *ap;
+        struct ata_ioports *aio;
+        int rc;
+
+        host = ata_host_alloc(dev, 1);
+        if (!host)
+                return -ENOMEM;
+
+        ap = host->ports[0];
+        ap->flags               |= ATA_FLAG_SLAVE_POSS;
+        ap->pio_mask            = 0x1f; /* Up to PIO4 */
+        ap->mwdma_mask          = 0x00; /* No MWDMA   */
+        ap->udma_mask           = 0x00; /* No UDMA    */
+        ap->ops                 = &mpc52xx_ata_port_ops;
+        host->private_data      = priv;
+
+        aio = &ap->ioaddr;
         aio->cmd_addr           = NULL; /* Don't have a classic reg block */
         aio->altstatus_addr     = &priv->ata_regs->tf_control;
         aio->ctl_addr           = &priv->ata_regs->tf_control;
@@ -344,11 +342,9 @@ mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv)
         aio->status_addr        = &priv->ata_regs->tf_command;
         aio->command_addr       = &priv->ata_regs->tf_command;
 
-        ae->private_data = priv;
-
-        rv = ata_device_add(ae);
-
-        return rv ? 0 : -EINVAL;
+        /* activate host */
+        return ata_host_activate(host, priv->ata_irq, ata_interrupt, 0,
+                                 &mpc52xx_ata_sht);
 }
 
 static struct mpc52xx_ata_priv *