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, 5 insertions, 8 deletions

diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 5598bd5936d9..440f43a86ad3 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -600,9 +600,8 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         unsigned long cmd_base, irqport;
         unsigned long bar0, cmd_phys_base, ctl;
         void __iomem *virt_base;
-        ide_hwif_t *hwif;
+        struct ide_host *host;
         hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
-        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
         struct ide_port_info d = sgiioc4_port_info;
 
         /*  Get the CmdBlk and CtrlBlk Base Registers */
@@ -635,16 +634,14 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         hw.chipset = ide_pci;
         hw.dev = &dev->dev;
 
-        hwif = ide_find_port_slot(&d);
-        if (hwif == NULL)
-                goto err;
-
         /* Initializing chipset IRQ Registers */
         writel(0x03, (void __iomem *)(irqport + IOC4_INTR_SET * 4));
 
-        idx[0] = hwif->index;
+        host = ide_host_alloc(&d, hws);
+        if (host == NULL)
+                goto err;
 
-        if (ide_device_add(idx, &d, hws))
+        if (ide_host_register(host, &d, hws))
                 return -EIO;
 
         return 0;