patch-2.3.6 linux/drivers/block/ide-pmac.c

• Lines: 44
• Date: Mon Jun 7 12:12:22 1999
• Orig file: v2.3.5/linux/drivers/block/ide-pmac.c
• Orig date: Fri May 14 18:55:14 1999

diff -u --recursive --new-file v2.3.5/linux/drivers/block/ide-pmac.c linux/drivers/block/ide-pmac.c
@@ -65,7 +65,6 @@
 				ide_ioreg_t ctrl_port,
 				int *irq)
 {
-	ide_ioreg_t reg = ide_ioreg_t data_port;
 	int i, r;
 
 	if (data_port == 0)
@@ -76,20 +75,15 @@
 	r = check_media_bay_by_base(data_port, MB_CD);
 	if (r == -EINVAL)
 		return;
-		
-	for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-		hw->io_ports[i] = reg * 0x10;
-		reg += 1;
-	}
-	if (ctrl_port) {
-		hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
-	} else {
-		hw->io_ports[IDE_CONTROL_OFFSET] = hw->io_ports[IDE_DATA_OFFSET] + 0x160;
-	}
+	
+	for ( i = 0; i < 8 ; ++i )
+		hw->io_ports[i] = data_port + i * 0x10;
+	hw->io_ports[8] = data_port + 0x160;
+
 	if (irq != NULL) {
 		*irq = 0;
 		for (i = 0; i < MAX_HWIFS; ++i) {
-			if (base == pmac_ide_regbase[i]) {
+			if (data_port == pmac_ide_regbase[i]) {
 				*irq = pmac_ide_irq[i];
 				break;
 			}
@@ -156,7 +150,7 @@
 			       np->full_name);
 			continue;
 		}
-		
+
 		base = (unsigned long) ioremap(np->addrs[0].address, 0x200);
 		
 		/* XXX This is bogus. Should be fixed in the registry by checking