From 20bf4f7695a7e2de0aff47e7989f4b7e3b6367c3 Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Thu, 23 Oct 2008 23:22:06 +0200
Subject: [PATCH] --- yaml --- r: 117754 b: refs/heads/master c:
 95a84cd19224e7d41934d261b568dd04bf2bda3e h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/ide/sgiioc4.c | 18 +++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 9bc610702575..352b09278c51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3059ef99a167da6d5d77701fda5b905d985e31af
+refs/heads/master: 95a84cd19224e7d41934d261b568dd04bf2bda3e
diff --git a/trunk/drivers/ide/sgiioc4.c b/trunk/drivers/ide/sgiioc4.c
index 9fadea41e1c6..d0cd670f4545 100644
--- a/trunk/drivers/ide/sgiioc4.c
+++ b/trunk/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);