sgiioc4: use ide_host_add() (take 2)

[linux-2.6-omap-h63xx.git] / drivers / ide / sgiioc4.c

diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c
index 9fadea41e1c69dcaf50daca2437bbe9d364268fd..d0cd670f45456501bc618c2837756fafc6d1fa20 100644 (file)
--- a/drivers/ide/sgiioc4.c
+++ b/drivers/ide/sgiioc4.c
@@ -567,9 +567,7 @@ 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;
-       struct ide_host *host;
        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
-       struct ide_port_info d = sgiioc4_port_info;
        int rc;
 
        /*  Get the CmdBlk and CtrlBlk Base Registers */
@@ -604,20 +602,10 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
        /* Initializing chipset IRQ Registers */
        writel(0x03, (void __iomem *)(irqport + IOC4_INTR_SET * 4));
 
-       host = ide_host_alloc(&d, hws);
-       if (host == NULL) {
-               rc = -ENOMEM;
-               goto err;
-       }
-
-       rc = ide_host_register(host, &d, hws);
-       if (rc)
-               goto err_free;
+       rc = ide_host_add(&sgiioc4_port_info, hws, NULL);
+       if (!rc)
+               return 0;
 
-       return 0;
-err_free:
-       ide_host_free(host);
-err:
        release_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE);
 req_mem_rgn_err:
        iounmap(virt_base);