patch-2.1.71 linux/drivers/block/opti621.c

Next file: linux/drivers/block/pdc4030.c
Previous file: linux/drivers/block/nbd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.70/linux/drivers/block/opti621.c linux/drivers/block/opti621.c
@@ -233,7 +233,7 @@
 
 	drdy = 2; /* DRDY is default 2 (by OPTi Databook) */
 
-	cycle1 = ((first.data_time-1)<<4) | (first.recovery_time-2);
+	cycle1 = ((first.data_time-1)<<4)  | (first.recovery_time-2);
 	cycle2 = ((second.data_time-1)<<4) | (second.recovery_time-2);
 	misc = READ_PREFETCH | ((ax-1)<<4) | ((drdy-2)<<1);
 
@@ -276,11 +276,9 @@
 /*
  * ide_init_opti621() is Called from idedma.c once for each hwif found at boot.
  */
-void ide_init_opti621 (byte bus, byte fn, ide_hwif_t *hwifs)
+void ide_init_opti621 (byte bus, byte fn, ide_hwif_t *hwif)
 {
-	if (hwif->io_ports[IDE_DATA_OFFSET]) {
-		hwif->drives[0].timing_data = PIO_DONT_KNOW;
-		hwif->drives[1].timing_data = PIO_DONT_KNOW;
-		hwif->tuneproc = &opti621_tune_drive;
-	}
+	hwif->drives[0].timing_data = PIO_DONT_KNOW;
+	hwif->drives[1].timing_data = PIO_DONT_KNOW;
+	hwif->tuneproc = &opti621_tune_drive;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov