diff options
Diffstat (limited to 'drivers/ide/legacy/ali14xx.c')
-rw-r--r-- | drivers/ide/legacy/ali14xx.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c index 9b9c4761cb7d..2f0ef9b44033 100644 --- a/drivers/ide/legacy/ali14xx.c +++ b/drivers/ide/legacy/ali14xx.c | |||
@@ -68,8 +68,6 @@ static RegInitializer initData[] __initdata = { | |||
68 | {0x35, 0x03}, {0x00, 0x00} | 68 | {0x35, 0x03}, {0x00, 0x00} |
69 | }; | 69 | }; |
70 | 70 | ||
71 | #define ALI_MAX_PIO 4 | ||
72 | |||
73 | /* timing parameter registers for each drive */ | 71 | /* timing parameter registers for each drive */ |
74 | static struct { u8 reg1, reg2, reg3, reg4; } regTab[4] = { | 72 | static struct { u8 reg1, reg2, reg3, reg4; } regTab[4] = { |
75 | {0x03, 0x26, 0x04, 0x27}, /* drive 0 */ | 73 | {0x03, 0x26, 0x04, 0x27}, /* drive 0 */ |
@@ -109,7 +107,7 @@ static void outReg (u8 data, u8 reg) | |||
109 | * This function computes timing parameters | 107 | * This function computes timing parameters |
110 | * and sets controller registers accordingly. | 108 | * and sets controller registers accordingly. |
111 | */ | 109 | */ |
112 | static void ali14xx_tune_drive (ide_drive_t *drive, u8 pio) | 110 | static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio) |
113 | { | 111 | { |
114 | int driveNum; | 112 | int driveNum; |
115 | int time1, time2; | 113 | int time1, time2; |
@@ -117,8 +115,6 @@ static void ali14xx_tune_drive (ide_drive_t *drive, u8 pio) | |||
117 | unsigned long flags; | 115 | unsigned long flags; |
118 | int bus_speed = system_bus_clock(); | 116 | int bus_speed = system_bus_clock(); |
119 | 117 | ||
120 | pio = ide_get_best_pio_mode(drive, pio, ALI_MAX_PIO); | ||
121 | |||
122 | /* calculate timing, according to PIO mode */ | 118 | /* calculate timing, according to PIO mode */ |
123 | time1 = ide_pio_cycle_time(drive, pio); | 119 | time1 = ide_pio_cycle_time(drive, pio); |
124 | time2 = ide_pio_timings[pio].active_time; | 120 | time2 = ide_pio_timings[pio].active_time; |
@@ -212,12 +208,12 @@ static int __init ali14xx_probe(void) | |||
212 | 208 | ||
213 | hwif->chipset = ide_ali14xx; | 209 | hwif->chipset = ide_ali14xx; |
214 | hwif->pio_mask = ATA_PIO4; | 210 | hwif->pio_mask = ATA_PIO4; |
215 | hwif->tuneproc = &ali14xx_tune_drive; | 211 | hwif->set_pio_mode = &ali14xx_set_pio_mode; |
216 | hwif->mate = mate; | 212 | hwif->mate = mate; |
217 | 213 | ||
218 | mate->chipset = ide_ali14xx; | 214 | mate->chipset = ide_ali14xx; |
219 | mate->pio_mask = ATA_PIO4; | 215 | mate->pio_mask = ATA_PIO4; |
220 | mate->tuneproc = &ali14xx_tune_drive; | 216 | mate->set_pio_mode = &ali14xx_set_pio_mode; |
221 | mate->mate = hwif; | 217 | mate->mate = hwif; |
222 | mate->channel = 1; | 218 | mate->channel = 1; |
223 | 219 | ||