From dc136b17c9a30aee1927f6afd747e479ed3d1377 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Wed, 1 Aug 2007 23:46:46 +0200
Subject: [PATCH] --- yaml --- r: 63551 b: refs/heads/master c:
 8b6b33be3280fd776335079124ecd176e6a40797 h: refs/heads/master i:   63549:
 0cfefe59c1ef47875487e1cea4d68a6877b02bcf   63547:
 fae33c4063bb23c93f863f013e57ab4220fa8c52   63543:
 e1b29566a7846479ef3552ae7faa8c86e52e2dbb   63535:
 e9dbcdf25d236f735b950797cf75c2f95d0787bc   63519:
 9317665f5153603ddce9c1a7787ac740d6dcf756   63487:
 8031156924b9ef682436918f5ea3f5b322cdd5a0 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/ide/pci/jmicron.c | 21 ++++-----------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 3fc82abaa946..c1e13ea03773 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68aaf8150308dbf9d0e5ccd5bc05491ba575f966
+refs/heads/master: 8b6b33be3280fd776335079124ecd176e6a40797
diff --git a/trunk/drivers/ide/pci/jmicron.c b/trunk/drivers/ide/pci/jmicron.c
index d7ce9dd8de16..65a0ff352b98 100644
--- a/trunk/drivers/ide/pci/jmicron.c
+++ b/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;
 }