diff options
| -rw-r--r-- | drivers/ide/ide-lib.c | 2 | ||||
| -rw-r--r-- | drivers/ide/pci/cmd64x.c | 7 | ||||
| -rw-r--r-- | drivers/ide/pci/siimage.c | 5 | ||||
| -rw-r--r-- | drivers/ide/ppc/scc_pata.c | 5 |
4 files changed, 4 insertions, 15 deletions
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c index 345456f4c00..bea5e13ee36 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) return -1; } -EXPORT_SYMBOL_GPL(ide_set_xfer_rate); - static void ide_dump_opcode(ide_drive_t *drive) { struct request *rq; diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index aee947e8fc3..009fc916844 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) 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/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index cbca5f05ff8..ad98510026a 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) 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/drivers/ide/ppc/scc_pata.c b/drivers/ide/ppc/scc_pata.c index 3993d08312d..65ad8ab3459 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) 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); } |