aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/ide-lib.c2
-rw-r--r--drivers/ide/pci/cmd64x.c7
-rw-r--r--drivers/ide/pci/siimage.c5
-rw-r--r--drivers/ide/ppc/scc_pata.c5
4 files changed, 4 insertions, 15 deletions
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 345456f4c002..bea5e13ee361 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -459,8 +459,6 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate)
459 return -1; 459 return -1;
460} 460}
461 461
462EXPORT_SYMBOL_GPL(ide_set_xfer_rate);
463
464static void ide_dump_opcode(ide_drive_t *drive) 462static void ide_dump_opcode(ide_drive_t *drive)
465{ 463{
466 struct request *rq; 464 struct request *rq;
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index aee947e8fc38..009fc9168443 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -466,11 +466,8 @@ static int config_chipset_for_dma (ide_drive_t *drive)
466 if (!speed) 466 if (!speed)
467 return 0; 467 return 0;
468 468
469 if(ide_set_xfer_rate(drive, speed)) 469 if (cmd64x_tune_chipset(drive, speed))
470 return 0; 470 return 0;
471
472 if (!drive->init_speed)
473 drive->init_speed = speed;
474 471
475 return ide_dma_enable(drive); 472 return ide_dma_enable(drive);
476} 473}
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index cbca5f05ff87..ad98510026a5 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -396,12 +396,9 @@ static int config_chipset_for_dma (ide_drive_t *drive)
396 if (!speed) 396 if (!speed)
397 return 0; 397 return 0;
398 398
399 if (ide_set_xfer_rate(drive, speed)) 399 if (siimage_tune_chipset(drive, speed))
400 return 0; 400 return 0;
401 401
402 if (!drive->init_speed)
403 drive->init_speed = speed;
404
405 return ide_dma_enable(drive); 402 return ide_dma_enable(drive);
406} 403}
407 404
diff --git a/drivers/ide/ppc/scc_pata.c b/drivers/ide/ppc/scc_pata.c
index 3993d08312dc..65ad8ab34598 100644
--- a/drivers/ide/ppc/scc_pata.c
+++ b/drivers/ide/ppc/scc_pata.c
@@ -363,12 +363,9 @@ static int scc_config_chipset_for_dma(ide_drive_t *drive)
363 if (!speed) 363 if (!speed)
364 return 0; 364 return 0;
365 365
366 if (ide_set_xfer_rate(drive, speed)) 366 if (scc_tune_chipset(drive, speed))
367 return 0; 367 return 0;
368 368
369 if (!drive->init_speed)
370 drive->init_speed = speed;
371
372 return ide_dma_enable(drive); 369 return ide_dma_enable(drive);
373} 370}
374 371