---

yaml
---
r: 63551
b: refs/heads/master
c: 8b6b33b
h: refs/heads/master
i:
  63549: 0cfefe5
  63547: fae33c4
  63543: e1b2956
  63535: e9dbcdf
  63519: 9317665
  63487: 8031156
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68aaf8150308dbf9d0e5ccd5bc05491ba575f966
+refs/heads/master: 8b6b33be3280fd776335079124ecd176e6a40797

trunk/drivers/ide/pci/jmicron.c

@@ -83,23 +83,10 @@ static u8 __devinit ata66_jmicron(ide_hwif_t *hwif)
 	return ATA_CBL_PATA80;
 }
 
-static void jmicron_tuneproc (ide_drive_t *drive, byte mode_wanted)
+static void jmicron_tuneproc(ide_drive_t *drive, u8 pio)
 {
-	return;
-}
-
-/**
- *	config_jmicron_chipset_for_pio	-	set drive timings
- *	@drive: drive to tune
- *	@speed we want
- *
- */
-
-static void config_jmicron_chipset_for_pio (ide_drive_t *drive, byte set_speed)
-{
-	u8 speed = XFER_PIO_0 + ide_get_best_pio_mode(drive, 255, 5);
-	if (set_speed)
-		(void) ide_config_drive_speed(drive, speed);
+	pio = ide_get_best_pio_mode(drive, pio, 5);
+	ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
 
 /**
@@ -132,7 +119,7 @@ static int jmicron_config_drive_for_dma (ide_drive_t *drive)
 	if (ide_tune_dma(drive))
 		return 0;
 
-	config_jmicron_chipset_for_pio(drive, 1);
+	jmicron_tuneproc(drive, 255);
 
 	return -1;
 }