ide: add struct ide_host (take 3)

* Add struct ide_host which keeps pointers to host's ports.

* Add ide_host_alloc[_all]() and ide_host_remove() helpers.

* Pass 'struct ide_host *host' instead of 'u8 *idx' to
  ide_device_add[_all]() and rename it to ide_host_register[_all]().

* Convert host drivers and core code to use struct ide_host.

* Remove no longer needed ide_find_port().

* Make ide_find_port_slot() static.

* Unexport ide_unregister().

v2:
* Add missing 'struct ide_host *host' to macide.c.

v3:
* Fix build problem in pmac.c (s/ide_alloc_host/ide_host_alloc/)
  (Noticed by Stephen Rothwell).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 11 insertions, 14 deletions

diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index ed1c9a134079..903c628bddd0 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -563,11 +563,10 @@ static int au_ide_probe(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         _auide_hwif *ahwif = &auide_hwif;
-        ide_hwif_t *hwif;
         struct resource *res;
+        struct ide_host *host;
         int ret = 0;
         hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
-        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
         char *mode = "MWDMA2";
@@ -604,25 +603,23 @@ static int au_ide_probe(struct device *dev)
                 goto out;
         }
 
-        hwif = ide_find_port();
-        if (hwif == NULL) {
-                ret = -ENOENT;
-                goto out;
-        }
-
         memset(&hw, 0, sizeof(hw));
         auide_setup_ports(&hw, ahwif);
         hw.irq = ahwif->irq;
         hw.dev = dev;
         hw.chipset = ide_au1xxx;
 
-        auide_hwif.hwif                 = hwif;
+        host = ide_host_alloc(&au1xxx_port_info, hws);
+        if (host == NULL) {
+                ret = -ENOENT;
+                goto out;
+        }
 
-        idx[0] = hwif->index;
+        ide_host_register(host, &au1xxx_port_info, hws);
 
-        ide_device_add(idx, &au1xxx_port_info, hws);
+        auide_hwif.hwif = host->ports[0];
 
-        dev_set_drvdata(dev, hwif);
+        dev_set_drvdata(dev, host);
 
         printk(KERN_INFO "Au1xxx IDE(builtin) configured for %s\n", mode );
 
@@ -634,10 +631,10 @@ static int au_ide_remove(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct resource *res;
-        ide_hwif_t *hwif = dev_get_drvdata(dev);
+        struct ide_host *host = dev_get_drvdata(dev);
         _auide_hwif *ahwif = &auide_hwif;
 
-        ide_unregister(hwif);
+        ide_host_remove(host);
 
         iounmap((void *)ahwif->regbase);