From: Bartlomiej Zolnierkiewicz Date: Sat, 26 Apr 2008 15:36:32 +0000 (+0200) Subject: swarm: use ide_find_port() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7d9f3d51cf351ac35b4004cc40c7fd885fb30c5c;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git swarm: use ide_find_port() Cc: Maciej W. Rozycki Signed-off-by: Bartlomiej Zolnierkiewicz --- diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c index 956259fc09b..bbe8d585334 100644 --- a/drivers/ide/mips/swarm.c +++ b/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));