8 files changed, 124 insertions, 163 deletions

diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index 0497e7f85b09..7c2afa97f417 100644
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -37,6 +37,8 @@
 #define CATWEASEL_NUM_HWIFS     3
 #define XSURF_NUM_HWIFS         2
 
+#define MAX_NUM_HWIFS           3
+
     /*
      *  Bases of the IDE interfaces (relative to the board address)
      */
@@ -148,18 +150,14 @@ static void __init buddha_setup_ports(hw_regs_t *hw, unsigned long base,
 
 static int __init buddha_init(void)
 {
-        hw_regs_t hw;
-        ide_hwif_t *hwif;
-        int i;
-
         struct zorro_dev *z = NULL;
         u_long buddha_board = 0;
         BuddhaType type;
-        int buddha_num_hwifs;
+        int buddha_num_hwifs, i;
 
         while ((z = zorro_find_device(ZORRO_WILDCARD, z))) {
                 unsigned long board;
-                u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+                hw_regs_t hw[MAX_NUM_HWIFS], *hws[] = { NULL, NULL, NULL, NULL };
 
                 if (z->id == ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA) {
                         buddha_num_hwifs = BUDDHA_NUM_HWIFS;
@@ -221,19 +219,13 @@ fail_base2:
                                 ack_intr = xsurf_ack_intr;
                         }
 
-                        buddha_setup_ports(&hw, base, ctl, irq_port, ack_intr);
+                        buddha_setup_ports(&hw[i], base, ctl, irq_port,
+                                           ack_intr);
 
-                        hwif = ide_find_port();
-                        if (hwif) {
-                                u8 index = hwif->index;
-
-                                ide_init_port_hw(hwif, &hw);
-
-                                idx[i] = index;
-                        }
+                        hws[i] = &hw[i];
                 }
 
-                ide_device_add(idx, NULL);
+                ide_host_add(NULL, hws, NULL);
         }
 
         return 0;
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index 129a812bb57f..724f95073d80 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -66,6 +66,27 @@ static void falconide_output_data(ide_drive_t *drive, struct request *rq,
         outsw_swapw(data_addr, buf, (len + 1) / 2);
 }
 
+/* Atari has a byte-swapped IDE interface */
+static const struct ide_tp_ops falconide_tp_ops = {
+        .exec_command           = ide_exec_command,
+        .read_status            = ide_read_status,
+        .read_altstatus         = ide_read_altstatus,
+        .read_sff_dma_status    = ide_read_sff_dma_status,
+
+        .set_irq                = ide_set_irq,
+
+        .tf_load                = ide_tf_load,
+        .tf_read                = ide_tf_read,
+
+        .input_data             = falconide_input_data,
+        .output_data            = falconide_output_data,
+};
+
+static const struct ide_port_info falconide_port_info = {
+        .tp_ops                 = &falconide_tp_ops,
+        .host_flags             = IDE_HFLAG_NO_DMA,
+};
+
 static void __init falconide_setup_ports(hw_regs_t *hw)
 {
         int i;
@@ -91,11 +112,12 @@ static void __init falconide_setup_ports(hw_regs_t *hw)
 
 static int __init falconide_init(void)
 {
-        hw_regs_t hw;
-        ide_hwif_t *hwif;
+        struct ide_host *host;
+        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        int rc;
 
         if (!MACH_IS_ATARI || !ATARIHW_PRESENT(IDE))
-                return 0;
+                return -ENODEV;
 
         printk(KERN_INFO "ide: Falcon IDE controller\n");
 
@@ -106,23 +128,25 @@ static int __init falconide_init(void)
 
         falconide_setup_ports(&hw);
 
-        hwif = ide_find_port();
-        if (hwif) {
-                u8 index = hwif->index;
-                u8 idx[4] = { index, 0xff, 0xff, 0xff };
-
-                ide_init_port_hw(hwif, &hw);
+        host = ide_host_alloc(&falconide_port_info, hws);
+        if (host == NULL) {
+                rc = -ENOMEM;
+                goto err;
+        }
 
-                /* Atari has a byte-swapped IDE interface */
-                hwif->input_data  = falconide_input_data;
-                hwif->output_data = falconide_output_data;
+        ide_get_lock(NULL, NULL);
+        rc = ide_host_register(host, &falconide_port_info, hws);
+        ide_release_lock();
 
-                ide_get_lock(NULL, NULL);
-                ide_device_add(idx, NULL);
-                ide_release_lock();
-        }
+        if (rc)
+                goto err_free;
 
         return 0;
+err_free:
+        ide_host_free(host);
+err:
+        release_mem_region(ATA_HD_BASE, 0x40);
+        return rc;
 }
 
 module_init(falconide_init);
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index 7e74b20202df..dd5c467d8dd0 100644
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -31,6 +31,8 @@
 #define GAYLE_BASE_4000 0xdd2020        /* A4000/A4000T */
 #define GAYLE_BASE_1200 0xda0000        /* A1200/A600 and E-Matrix 530 */
 
+#define GAYLE_IDEREG_SIZE       0x2000
+
     /*
      *  Offsets from one of the above bases
      */
@@ -56,13 +58,11 @@
 #define GAYLE_NUM_HWIFS         1
 #define GAYLE_NUM_PROBE_HWIFS   GAYLE_NUM_HWIFS
 #define GAYLE_HAS_CONTROL_REG   1
-#define GAYLE_IDEREG_SIZE       0x2000
 #else /* CONFIG_BLK_DEV_IDEDOUBLER */
 #define GAYLE_NUM_HWIFS         2
 #define GAYLE_NUM_PROBE_HWIFS   (ide_doubler ? GAYLE_NUM_HWIFS : \
                                                GAYLE_NUM_HWIFS-1)
 #define GAYLE_HAS_CONTROL_REG   (!ide_doubler)
-#define GAYLE_IDEREG_SIZE       (ide_doubler ? 0x1000 : 0x2000)
 
 static int ide_doubler;
 module_param_named(doubler, ide_doubler, bool, 0);
@@ -124,8 +124,11 @@ static void __init gayle_setup_ports(hw_regs_t *hw, unsigned long base,
 
 static int __init gayle_init(void)
 {
+    unsigned long phys_base, res_start, res_n;
+    unsigned long base, ctrlport, irqport;
+    ide_ack_intr_t *ack_intr;
     int a4000, i;
-    u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+    hw_regs_t hw[GAYLE_NUM_HWIFS], *hws[] = { NULL, NULL, NULL, NULL };
 
     if (!MACH_IS_AMIGA)
         return -ENODEV;
@@ -148,13 +151,6 @@ found:
 #endif
                          "");
 
-    for (i = 0; i < GAYLE_NUM_PROBE_HWIFS; i++) {
-        unsigned long base, ctrlport, irqport;
-        ide_ack_intr_t *ack_intr;
-        hw_regs_t hw;
-        ide_hwif_t *hwif;
-        unsigned long phys_base, res_start, res_n;
-
         if (a4000) {
             phys_base = GAYLE_BASE_4000;
             irqport = (unsigned long)ZTWO_VADDR(GAYLE_IRQ_4000);
@@ -168,33 +164,22 @@ found:
  * FIXME: we now have selectable modes between mmio v/s iomio
  */
 
-        phys_base += i*GAYLE_NEXT_PORT;
-
         res_start = ((unsigned long)phys_base) & ~(GAYLE_NEXT_PORT-1);
         res_n = GAYLE_IDEREG_SIZE;
 
         if (!request_mem_region(res_start, res_n, "IDE"))
-            continue;
+                return -EBUSY;
 
-        base = (unsigned long)ZTWO_VADDR(phys_base);
+    for (i = 0; i < GAYLE_NUM_PROBE_HWIFS; i++) {
+        base = (unsigned long)ZTWO_VADDR(phys_base + i * GAYLE_NEXT_PORT);
         ctrlport = GAYLE_HAS_CONTROL_REG ? (base + GAYLE_CONTROL) : 0;
 
-        gayle_setup_ports(&hw, base, ctrlport, irqport, ack_intr);
-
-        hwif = ide_find_port();
-        if (hwif) {
-            u8 index = hwif->index;
+        gayle_setup_ports(&hw[i], base, ctrlport, irqport, ack_intr);
 
-            ide_init_port_hw(hwif, &hw);
-
-            idx[i] = index;
-        } else
-            release_mem_region(res_start, res_n);
+        hws[i] = &hw[i];
     }
 
-    ide_device_add(idx, NULL);
-
-    return 0;
+    return ide_host_add(NULL, hws, NULL);
 }
 
 module_init(gayle_init);
diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c
index 89c8ff0a4d08..c76d55de6996 100644
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/legacy/ide-4drives.c
@@ -28,10 +28,8 @@ static const struct ide_port_info ide_4drives_port_info = {
 
 static int __init ide_4drives_init(void)
 {
-        ide_hwif_t *hwif, *mate;
         unsigned long base = 0x1f0, ctl = 0x3f6;
-        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
-        hw_regs_t hw;
+        hw_regs_t hw, *hws[] = { &hw, &hw, NULL, NULL };
 
         if (probe_4drives == 0)
                 return -ENODEV;
@@ -55,21 +53,7 @@ static int __init ide_4drives_init(void)
         hw.irq = 14;
         hw.chipset = ide_4drives;
 
-        hwif = ide_find_port();
-        if (hwif) {
-                ide_init_port_hw(hwif, &hw);
-                idx[0] = hwif->index;
-        }
-
-        mate = ide_find_port();
-        if (mate) {
-                ide_init_port_hw(mate, &hw);
-                idx[1] = mate->index;
-        }
-
-        ide_device_add(idx, &ide_4drives_port_info);
-
-        return 0;
+        return ide_host_add(&ide_4drives_port_info, hws, NULL);
 }
 
 module_init(ide_4drives_init);
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index 27b1e0b7ecb4..21bfac137844 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -74,7 +74,7 @@ INT_MODULE_PARM(pc_debug, 0);
 
 typedef struct ide_info_t {
         struct pcmcia_device    *p_dev;
-        ide_hwif_t              *hwif;
+        struct ide_host         *host;
     int         ndev;
     dev_node_t  node;
 } ide_info_t;
@@ -132,7 +132,7 @@ static int ide_probe(struct pcmcia_device *link)
 static void ide_detach(struct pcmcia_device *link)
 {
     ide_info_t *info = link->priv;
-    ide_hwif_t *hwif = info->hwif;
+    ide_hwif_t *hwif = info->host->ports[0];
     unsigned long data_addr, ctl_addr;
 
     DEBUG(0, "ide_detach(0x%p)\n", link);
@@ -157,13 +157,13 @@ static const struct ide_port_info idecs_port_info = {
         .host_flags             = IDE_HFLAG_NO_DMA,
 };
 
-static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl,
+static struct ide_host *idecs_register(unsigned long io, unsigned long ctl,
                                 unsigned long irq, struct pcmcia_device *handle)
 {
+    struct ide_host *host;
     ide_hwif_t *hwif;
-    hw_regs_t hw;
-    int i;
-    u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+    int i, rc;
+    hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
 
     if (!request_region(io, 8, DRV_NAME)) {
         printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",
@@ -184,30 +184,24 @@ static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl,
     hw.chipset = ide_pci;
     hw.dev = &handle->dev;
 
-    hwif = ide_find_port();
-    if (hwif == NULL)
+    rc = ide_host_add(&idecs_port_info, hws, &host);
+    if (rc)
         goto out_release;
 
-    i = hwif->index;
-
-    ide_init_port_hw(hwif, &hw);
-
-    idx[0] = i;
-
-    ide_device_add(idx, &idecs_port_info);
+    hwif = host->ports[0];
 
     if (hwif->present)
-        return hwif;
+        return host;
 
     /* retry registration in case device is still spinning up */
     for (i = 0; i < 10; i++) {
         msleep(100);
         ide_port_scan(hwif);
         if (hwif->present)
-            return hwif;
+            return host;
     }
 
-    return hwif;
+    return host;
 
 out_release:
     release_region(ctl, 1);
@@ -239,7 +233,7 @@ static int ide_config(struct pcmcia_device *link)
     cistpl_cftable_entry_t *cfg;
     int pass, last_ret = 0, last_fn = 0, is_kme = 0;
     unsigned long io_base, ctl_base;
-    ide_hwif_t *hwif;
+    struct ide_host *host;
 
     DEBUG(0, "ide_config(0x%p)\n", link);
 
@@ -334,21 +328,21 @@ static int ide_config(struct pcmcia_device *link)
     if (is_kme)
         outb(0x81, ctl_base+1);
 
-     hwif = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, link);
-     if (hwif == NULL && link->io.NumPorts1 == 0x20) {
+     host = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, link);
+     if (host == NULL && link->io.NumPorts1 == 0x20) {
             outb(0x02, ctl_base + 0x10);
-            hwif = idecs_register(io_base + 0x10, ctl_base + 0x10,
+            host = idecs_register(io_base + 0x10, ctl_base + 0x10,
                                   link->irq.AssignedIRQ, link);
     }
 
-    if (hwif == NULL)
+    if (host == NULL)
         goto failed;
 
     info->ndev = 1;
-    sprintf(info->node.dev_name, "hd%c", 'a' + hwif->index * 2);
-    info->node.major = hwif->major;
+    sprintf(info->node.dev_name, "hd%c", 'a' + host->ports[0]->index * 2);
+    info->node.major = host->ports[0]->major;
     info->node.minor = 0;
-    info->hwif = hwif;
+    info->host = host;
     link->dev_node = &info->node;
     printk(KERN_INFO "ide-cs: %s: Vpp = %d.%d\n",
            info->node.dev_name, link->conf.Vpp / 10, link->conf.Vpp % 10);
@@ -379,15 +373,15 @@ failed:
 static void ide_release(struct pcmcia_device *link)
 {
     ide_info_t *info = link->priv;
-    ide_hwif_t *hwif = info->hwif;
+    struct ide_host *host = info->host;
 
     DEBUG(0, "ide_release(0x%p)\n", link);
 
-    if (info->ndev) {
+    if (info->ndev)
         /* FIXME: if this fails we need to queue the cleanup somehow
            -- need to investigate the required PCMCIA magic */
-        ide_unregister(hwif);
-    }
+        ide_host_remove(host);
+
     info->ndev = 0;
 
     pcmcia_disable_device(link);
diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/legacy/ide_platform.c
index a249562b34b5..051b4ab0f359 100644
--- a/drivers/ide/legacy/ide_platform.c
+++ b/drivers/ide/legacy/ide_platform.c
@@ -52,12 +52,10 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
 {
         struct resource *res_base, *res_alt, *res_irq;
         void __iomem *base, *alt_base;
-        ide_hwif_t *hwif;
         struct pata_platform_info *pdata;
-        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
-        int ret = 0;
-        int mmio = 0;
-        hw_regs_t hw;
+        struct ide_host *host;
+        int ret = 0, mmio = 0;
+        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
         struct ide_port_info d = platform_ide_port_info;
 
         pdata = pdev->dev.platform_data;
@@ -94,28 +92,18 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
                         res_alt->start, res_alt->end - res_alt->start + 1);
         }
 
-        hwif = ide_find_port();
-        if (!hwif) {
-                ret = -ENODEV;
-                goto out;
-        }
-
         memset(&hw, 0, sizeof(hw));
         plat_ide_setup_ports(&hw, base, alt_base, pdata, res_irq->start);
         hw.dev = &pdev->dev;
 
-        ide_init_port_hw(hwif, &hw);
-
-        if (mmio) {
+        if (mmio)
                 d.host_flags |= IDE_HFLAG_MMIO;
-                default_hwif_mmiops(hwif);
-        }
 
-        idx[0] = hwif->index;
-
-        ide_device_add(idx, &d);
+        ret = ide_host_add(&d, hws, &host);
+        if (ret)
+                goto out;
 
-        platform_set_drvdata(pdev, hwif);
+        platform_set_drvdata(pdev, host);
 
         return 0;
 
@@ -125,9 +113,9 @@ out:
 
 static int __devexit plat_ide_remove(struct platform_device *pdev)
 {
-        ide_hwif_t *hwif = pdev->dev.driver_data;
+        struct ide_host *host = pdev->dev.driver_data;
 
-        ide_unregister(hwif);
+        ide_host_remove(host);
 
         return 0;
 }
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index 0a6195bcfeda..a0bb167980e7 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -91,11 +91,10 @@ static const char *mac_ide_name[] =
 
 static int __init macide_init(void)
 {
-        ide_hwif_t *hwif;
         ide_ack_intr_t *ack_intr;
         unsigned long base;
         int irq;
-        hw_regs_t hw;
+        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
 
         if (!MACH_IS_MAC)
                 return -ENODEV;
@@ -125,17 +124,7 @@ static int __init macide_init(void)
 
         macide_setup_ports(&hw, base, irq, ack_intr);
 
-        hwif = ide_find_port();
-        if (hwif) {
-                u8 index = hwif->index;
-                u8 idx[4] = { index, 0xff, 0xff, 0xff };
-
-                ide_init_port_hw(hwif, &hw);
-
-                ide_device_add(idx, NULL);
-        }
-
-        return 0;
+        return ide_host_add(NULL, hws, NULL);
 }
 
 module_init(macide_init);
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 9c2b9d078f69..4abd8fc78197 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -96,6 +96,27 @@ static void q40ide_output_data(ide_drive_t *drive, struct request *rq,
         outsw_swapw(data_addr, buf, (len + 1) / 2);
 }
 
+/* Q40 has a byte-swapped IDE interface */
+static const struct ide_tp_ops q40ide_tp_ops = {
+        .exec_command           = ide_exec_command,
+        .read_status            = ide_read_status,
+        .read_altstatus         = ide_read_altstatus,
+        .read_sff_dma_status    = ide_read_sff_dma_status,
+
+        .set_irq                = ide_set_irq,
+
+        .tf_load                = ide_tf_load,
+        .tf_read                = ide_tf_read,
+
+        .input_data             = q40ide_input_data,
+        .output_data            = q40ide_output_data,
+};
+
+static const struct ide_port_info q40ide_port_info = {
+        .tp_ops                 = &q40ide_tp_ops,
+        .host_flags             = IDE_HFLAG_NO_DMA,
+};
+
 /* 
  * the static array is needed to have the name reported in /proc/ioports,
  * hwif->name unfortunately isn't available yet
@@ -111,9 +132,7 @@ static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={
 static int __init q40ide_init(void)
 {
     int i;
-    ide_hwif_t *hwif;
-    const char *name;
-    u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+    hw_regs_t hw[Q40IDE_NUM_HWIFS], *hws[] = { NULL, NULL, NULL, NULL };
 
     if (!MACH_IS_Q40)
       return -ENODEV;
@@ -121,9 +140,8 @@ static int __init q40ide_init(void)
     printk(KERN_INFO "ide: Q40 IDE controller\n");
 
     for (i = 0; i < Q40IDE_NUM_HWIFS; i++) {
-        hw_regs_t hw;
+        const char *name = q40_ide_names[i];
 
-        name = q40_ide_names[i];
         if (!request_region(pcide_bases[i], 8, name)) {
                 printk("could not reserve ports %lx-%lx for %s\n",
                        pcide_bases[i],pcide_bases[i]+8,name);
@@ -135,26 +153,13 @@ static int __init q40ide_init(void)
                 release_region(pcide_bases[i], 8);
                 continue;
         }
-        q40_ide_setup_ports(&hw, pcide_bases[i],
-                        NULL,
-//                      m68kide_iops,
+        q40_ide_setup_ports(&hw[i], pcide_bases[i], NULL,
                         q40ide_default_irq(pcide_bases[i]));
 
-        hwif = ide_find_port();
-        if (hwif) {
-                ide_init_port_hw(hwif, &hw);
-
-                /* Q40 has a byte-swapped IDE interface */
-                hwif->input_data  = q40ide_input_data;
-                hwif->output_data = q40ide_output_data;
-
-                idx[i] = hwif->index;
-        }
+        hws[i] = &hw[i];
     }
 
-    ide_device_add(idx, NULL);
-
-    return 0;
+    return ide_host_add(&q40ide_port_info, hws, NULL);
 }
 
 module_init(q40ide_init);