From 07a793df6feaf763247a1bdc0fb661799154e98e Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 26 Apr 2008 17:36:32 +0200
Subject: [PATCH] --- yaml --- r: 93537 b: refs/heads/master c:
 7d9f3d51cf351ac35b4004cc40c7fd885fb30c5c h: refs/heads/master i:   93535:
 cd2225317468c178af470047f641be3ef0ac0731 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/ide/mips/swarm.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 4e42af2fca32..15d3356d9314 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59bff5ba5529feac3a0214d897b1920cbe4e2278
+refs/heads/master: 7d9f3d51cf351ac35b4004cc40c7fd885fb30c5c
diff --git a/trunk/drivers/ide/mips/swarm.c b/trunk/drivers/ide/mips/swarm.c
index 956259fc09ba..bbe8d5853348 100644
--- a/trunk/drivers/ide/mips/swarm.c
+++ b/trunk/drivers/ide/mips/swarm.c
@@ -76,17 +76,12 @@ static int __devinit swarm_ide_probe(struct device *dev)
 	if (!SIBYTE_HAVE_IDE)
 		return -ENODEV;
 
-	/* Find an empty slot.  */
-	for (i = 0; i < MAX_HWIFS; i++)
-		if (!ide_hwifs[i].io_ports[IDE_DATA_OFFSET])
-			break;
-	if (i >= MAX_HWIFS) {
+	hwif = ide_find_port();
+	if (hwif == NULL) {
 		printk(KERN_ERR DRV_NAME ": no free slot for interface\n");
 		return -ENOMEM;
 	}
 
-	hwif = ide_hwifs + i;
-
 	base = ioremap(A_IO_EXT_BASE, 0x800);
 	offset = __raw_readq(base + R_IO_EXT_REG(R_IO_EXT_START_ADDR, IDE_CS));
 	size = __raw_readq(base + R_IO_EXT_REG(R_IO_EXT_MULT_SIZE, IDE_CS));