1 files changed, 24 insertions, 20 deletions

diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 1a61cc891741..d042efdfbac4 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -49,13 +49,13 @@ static struct ata_port_operations isapnp_port_ops = {
         .thaw           = ata_bmdma_thaw,
         .error_handler  = ata_bmdma_error_handler,
         .post_internal_cmd = ata_bmdma_post_internal_cmd,
+        .cable_detect   = ata_cable_40wire,
 
         .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,
@@ -74,8 +74,10 @@ static struct ata_port_operations isapnp_port_ops = {
 
 static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev_id)
 {
-        struct ata_probe_ent ae;
+        struct ata_host *host;
+        struct ata_port *ap;
         void __iomem *cmd_addr, *ctl_addr;
+        int rc;
 
         if (pnp_port_valid(idev, 0) == 0)
                 return -ENODEV;
@@ -84,34 +86,36 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
         if (pnp_irq_valid(idev, 0) == 0)
                 return -ENODEV;
 
+        /* allocate host */
+        host = ata_host_alloc(&idev->dev, 1);
+        if (!host)
+                return -ENOMEM;
+
+        /* acquire resources and fill host */
         cmd_addr = devm_ioport_map(&idev->dev, pnp_port_start(idev, 0), 8);
         if (!cmd_addr)
                 return -ENOMEM;
 
-        memset(&ae, 0, sizeof(struct ata_probe_ent));
-        INIT_LIST_HEAD(&ae.node);
-        ae.dev = &idev->dev;
-        ae.port_ops = &isapnp_port_ops;
-        ae.sht = &isapnp_sht;
-        ae.n_ports = 1;
-        ae.pio_mask = 1;                /* ISA so PIO 0 cycles */
-        ae.irq = pnp_irq(idev, 0);
-        ae.irq_flags = 0;
-        ae.port_flags = ATA_FLAG_SLAVE_POSS;
-        ae.port[0].cmd_addr = cmd_addr;
+        ap = host->ports[0];
+
+        ap->ops = &isapnp_port_ops;
+        ap->pio_mask = 1;
+        ap->flags |= ATA_FLAG_SLAVE_POSS;
+
+        ap->ioaddr.cmd_addr = cmd_addr;
 
         if (pnp_port_valid(idev, 1) == 0) {
                 ctl_addr = devm_ioport_map(&idev->dev,
                                            pnp_port_start(idev, 1), 1);
-                ae.port[0].altstatus_addr = ctl_addr;
-                ae.port[0].ctl_addr = ctl_addr;
-                ae.port_flags |= ATA_FLAG_SRST;
+                ap->ioaddr.altstatus_addr = ctl_addr;
+                ap->ioaddr.ctl_addr = ctl_addr;
         }
-        ata_std_ports(&ae.port[0]);
 
-        if (ata_device_add(&ae) == 0)
-                return -ENODEV;
-        return 0;
+        ata_std_ports(&ap->ioaddr);
+
+        /* activate */
+        return ata_host_activate(host, pnp_irq(idev, 0), ata_interrupt, 0,
+                                 &isapnp_sht);
 }
 
 /**