patch-2.1.8 linux/drivers/block/cmd640.c

• Lines: 25
• Date: Wed Nov 6 14:49:31 1996
• Orig file: v2.1.7/linux/drivers/block/cmd640.c
• Orig date: Mon Sep 2 08:41:25 1996

diff -u --recursive --new-file v2.1.7/linux/drivers/block/cmd640.c linux/drivers/block/cmd640.c
@@ -431,9 +431,9 @@
 	for (i = 0; i < MAX_HWIFS; i++) {
 		ide_hwif_t *hwif = &ide_hwifs[i];
 		if (hwif->chipset == ide_unknown || hwif->chipset == ide_generic) {
-			if (hwif->io_base == 0x1f0)
+			if (hwif->io_ports[IDE_DATA_OFFSET] == 0x1f0)
 				cmd_hwif0 = hwif;
-			else if (hwif->io_base == 0x170)
+			else if (hwif->io_ports[IDE_DATA_OFFSET] == 0x170)
 				cmd_hwif1 = hwif;
 		}
 	}
@@ -678,11 +678,10 @@
 	(void) ide_get_best_pio_mode (drive, mode_wanted, 5, &d);
 	cmd640_set_mode (index, d.pio_mode, d.cycle_time);
 
-	printk ("%s: selected cmd640 PIO mode%d (%dns) %s/IORDY%s",
+	printk ("%s: selected cmd640 PIO mode%d (%dns)%s",
 		drive->name,
 		d.pio_mode,
 		d.cycle_time,
-		d.use_iordy ? "w" : "wo",
 		d.overridden ? " (overriding vendor mode)" : "");
 	display_clocks(index);
 }