From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu, 17 Apr 2008 22:46:34 +0000 (+0200)
Subject: cmd640: cleanup setup_device_ptrs()
X-Git-Tag: v2.6.26-rc1~1148^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=daaad24fdc2ed7cd45d9a09abdec46c0d34031a1;p=linux-2.6-omap-h63xx.git

cmd640: cleanup setup_device_ptrs()

This loop is no longer needed.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index 58a95f62e38..6b8e4061d3c 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -409,19 +409,9 @@ static void __init check_prefetch (unsigned int index)
  */
 static void __init setup_device_ptrs (void)
 {
-	unsigned int i;
+	cmd_hwif0 = &ide_hwifs[0];
+	cmd_hwif1 = &ide_hwifs[1];
 
-	cmd_hwif0 = &ide_hwifs[0]; /* default, if not found below */
-	cmd_hwif1 = &ide_hwifs[1]; /* default, if not found below */
-	for (i = 0; i < MAX_HWIFS; i++) {
-		ide_hwif_t *hwif = &ide_hwifs[i];
-		if (hwif->chipset == ide_unknown) {
-			if (hwif->io_ports[IDE_DATA_OFFSET] == 0x1f0)
-				cmd_hwif0 = hwif;
-			else if (hwif->io_ports[IDE_DATA_OFFSET] == 0x170)
-				cmd_hwif1 = hwif;
-		}
-	}
 	cmd_drives[0] = &cmd_hwif0->drives[0];
 	cmd_drives[1] = &cmd_hwif0->drives[1];
 	cmd_drives[2] = &cmd_hwif1->drives[0];