diff options
Diffstat (limited to 'drivers/ide/cs5535.c')
-rw-r--r-- | drivers/ide/cs5535.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c index b883838adc24..5059fafadf29 100644 --- a/drivers/ide/cs5535.c +++ b/drivers/ide/cs5535.c | |||
@@ -86,7 +86,7 @@ static void cs5535_set_speed(ide_drive_t *drive, const u8 speed) | |||
86 | cmd = pioa = speed - XFER_PIO_0; | 86 | cmd = pioa = speed - XFER_PIO_0; |
87 | 87 | ||
88 | if (pair) { | 88 | if (pair) { |
89 | u8 piob = ide_get_best_pio_mode(pair, 255, 4); | 89 | u8 piob = pair->pio_mode - XFER_PIO_0; |
90 | 90 | ||
91 | if (piob < cmd) | 91 | if (piob < cmd) |
92 | cmd = piob; | 92 | cmd = piob; |
@@ -129,28 +129,28 @@ static void cs5535_set_speed(ide_drive_t *drive, const u8 speed) | |||
129 | 129 | ||
130 | /** | 130 | /** |
131 | * cs5535_set_dma_mode - set host controller for DMA mode | 131 | * cs5535_set_dma_mode - set host controller for DMA mode |
132 | * @hwif: port | ||
132 | * @drive: drive | 133 | * @drive: drive |
133 | * @speed: DMA mode | ||
134 | * | 134 | * |
135 | * Programs the chipset for DMA mode. | 135 | * Programs the chipset for DMA mode. |
136 | */ | 136 | */ |
137 | 137 | ||
138 | static void cs5535_set_dma_mode(ide_drive_t *drive, const u8 speed) | 138 | static void cs5535_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive) |
139 | { | 139 | { |
140 | cs5535_set_speed(drive, speed); | 140 | cs5535_set_speed(drive, drive->dma_mode); |
141 | } | 141 | } |
142 | 142 | ||
143 | /** | 143 | /** |
144 | * cs5535_set_pio_mode - set host controller for PIO mode | 144 | * cs5535_set_pio_mode - set host controller for PIO mode |
145 | * @hwif: port | ||
145 | * @drive: drive | 146 | * @drive: drive |
146 | * @pio: PIO mode number | ||
147 | * | 147 | * |
148 | * A callback from the upper layers for PIO-only tuning. | 148 | * A callback from the upper layers for PIO-only tuning. |
149 | */ | 149 | */ |
150 | 150 | ||
151 | static void cs5535_set_pio_mode(ide_drive_t *drive, const u8 pio) | 151 | static void cs5535_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) |
152 | { | 152 | { |
153 | cs5535_set_speed(drive, XFER_PIO_0 + pio); | 153 | cs5535_set_speed(drive, drive->pio_mode); |
154 | } | 154 | } |
155 | 155 | ||
156 | static u8 cs5535_cable_detect(ide_hwif_t *hwif) | 156 | static u8 cs5535_cable_detect(ide_hwif_t *hwif) |