diff options
Diffstat (limited to 'drivers/ide/ppc')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 222adcb54823..284bb7c39b87 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -411,7 +411,6 @@ kauai_lookup_timing(struct kauai_timing* table, int cycle_time) | |||
411 | 411 | ||
412 | static void pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif); | 412 | static void pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif); |
413 | static int pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq); | 413 | static int pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq); |
414 | static int pmac_ide_tune_chipset(ide_drive_t *drive, u8 speed); | ||
415 | static void pmac_ide_tuneproc(ide_drive_t *drive, u8 pio); | 414 | static void pmac_ide_tuneproc(ide_drive_t *drive, u8 pio); |
416 | static void pmac_ide_selectproc(ide_drive_t *drive); | 415 | static void pmac_ide_selectproc(ide_drive_t *drive); |
417 | static void pmac_ide_kauai_selectproc(ide_drive_t *drive); | 416 | static void pmac_ide_kauai_selectproc(ide_drive_t *drive); |
@@ -920,16 +919,13 @@ set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2, | |||
920 | * our dedicated function is more precise as it uses the drive provided | 919 | * our dedicated function is more precise as it uses the drive provided |
921 | * cycle time value. We should probably fix this one to deal with that too... | 920 | * cycle time value. We should probably fix this one to deal with that too... |
922 | */ | 921 | */ |
923 | static int | 922 | static int pmac_ide_tune_chipset(ide_drive_t *drive, const u8 speed) |
924 | pmac_ide_tune_chipset (ide_drive_t *drive, byte speed) | ||
925 | { | 923 | { |
926 | int unit = (drive->select.b.unit & 0x01); | 924 | int unit = (drive->select.b.unit & 0x01); |
927 | int ret = 0; | 925 | int ret = 0; |
928 | pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)HWIF(drive)->hwif_data; | 926 | pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)HWIF(drive)->hwif_data; |
929 | u32 *timings, *timings2; | 927 | u32 *timings, *timings2; |
930 | 928 | ||
931 | speed = ide_rate_filter(drive, speed); | ||
932 | |||
933 | if (pmif == NULL) | 929 | if (pmif == NULL) |
934 | return 1; | 930 | return 1; |
935 | 931 | ||