From 1a5a1f957e3ac6ad24d356a3dea6ebb4687349a5 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 17 Feb 2007 02:40:24 +0100
Subject: [PATCH] --- yaml --- r: 48823 b: refs/heads/master c:
 056a697b7388844a1341e92e277bff8e5bf61ec9 h: refs/heads/master i:   48821:
 65f9406b63abeac0a4b7df301a378877f388ed10   48819:
 cd07ba0d39d1a2564c513349503d4a04bf49607d   48815:
 756382464d42ed917ff474e136e4e707550980a7 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/ide/ide-lib.c      | 2 --
 trunk/drivers/ide/pci/cmd64x.c   | 7 ++-----
 trunk/drivers/ide/pci/siimage.c  | 5 +----
 trunk/drivers/ide/ppc/scc_pata.c | 5 +----
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 38774811a117..21bf34fe420a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c94964a4555eb58be3f45edf2b63a2b3f549ef29
+refs/heads/master: 056a697b7388844a1341e92e277bff8e5bf61ec9
diff --git a/trunk/drivers/ide/ide-lib.c b/trunk/drivers/ide/ide-lib.c
index 345456f4c002..bea5e13ee361 100644
--- a/trunk/drivers/ide/ide-lib.c
+++ b/trunk/drivers/ide/ide-lib.c
@@ -459,8 +459,6 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate)
 		return -1;
 }
 
-EXPORT_SYMBOL_GPL(ide_set_xfer_rate);
-
 static void ide_dump_opcode(ide_drive_t *drive)
 {
 	struct request *rq;
diff --git a/trunk/drivers/ide/pci/cmd64x.c b/trunk/drivers/ide/pci/cmd64x.c
index aee947e8fc38..009fc9168443 100644
--- a/trunk/drivers/ide/pci/cmd64x.c
+++ b/trunk/drivers/ide/pci/cmd64x.c
@@ -466,11 +466,8 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 	if (!speed)
 		return 0;
 
-	if(ide_set_xfer_rate(drive, speed))
-		return 0; 
-
-	if (!drive->init_speed)
-		drive->init_speed = speed;
+	if (cmd64x_tune_chipset(drive, speed))
+		return 0;
 
 	return ide_dma_enable(drive);
 }
diff --git a/trunk/drivers/ide/pci/siimage.c b/trunk/drivers/ide/pci/siimage.c
index cbca5f05ff87..ad98510026a5 100644
--- a/trunk/drivers/ide/pci/siimage.c
+++ b/trunk/drivers/ide/pci/siimage.c
@@ -396,12 +396,9 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 	if (!speed)
 		return 0;
 
-	if (ide_set_xfer_rate(drive, speed))
+	if (siimage_tune_chipset(drive, speed))
 		return 0;
 
-	if (!drive->init_speed)
-		drive->init_speed = speed;
-
 	return ide_dma_enable(drive);
 }
 
diff --git a/trunk/drivers/ide/ppc/scc_pata.c b/trunk/drivers/ide/ppc/scc_pata.c
index 3993d08312dc..65ad8ab34598 100644
--- a/trunk/drivers/ide/ppc/scc_pata.c
+++ b/trunk/drivers/ide/ppc/scc_pata.c
@@ -363,12 +363,9 @@ static int scc_config_chipset_for_dma(ide_drive_t *drive)
 	if (!speed)
 		return 0;
 
-	if (ide_set_xfer_rate(drive, speed))
+	if (scc_tune_chipset(drive, speed))
 		return 0;
 
-	if (!drive->init_speed)
-		drive->init_speed = speed;
-
 	return ide_dma_enable(drive);
 }