diff options
Diffstat (limited to 'drivers/ide/pci/cs5535.c')
-rw-r--r-- | drivers/ide/pci/cs5535.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c index bc00e7b62151..383b7eccbcbb 100644 --- a/drivers/ide/pci/cs5535.c +++ b/drivers/ide/pci/cs5535.c | |||
@@ -147,16 +147,16 @@ static int cs5535_set_drive(ide_drive_t *drive, u8 speed) | |||
147 | return 0; | 147 | return 0; |
148 | } | 148 | } |
149 | 149 | ||
150 | /**** | 150 | /** |
151 | * cs5535_tuneproc - PIO setup | 151 | * cs5535_set_pio_mode - PIO setup |
152 | * @drive: drive to set up | 152 | * @drive: drive |
153 | * @pio: mode to use (255 for 'best possible') | 153 | * @pio: PIO mode number |
154 | * | 154 | * |
155 | * A callback from the upper layers for PIO-only tuning. | 155 | * A callback from the upper layers for PIO-only tuning. |
156 | */ | 156 | */ |
157 | static void cs5535_tuneproc(ide_drive_t *drive, u8 pio) | 157 | |
158 | static void cs5535_set_pio_mode(ide_drive_t *drive, const u8 pio) | ||
158 | { | 159 | { |
159 | pio = ide_get_best_pio_mode(drive, pio, 4); | ||
160 | ide_config_drive_speed(drive, XFER_PIO_0 + pio); | 160 | ide_config_drive_speed(drive, XFER_PIO_0 + pio); |
161 | cs5535_set_speed(drive, XFER_PIO_0 + pio); | 161 | cs5535_set_speed(drive, XFER_PIO_0 + pio); |
162 | } | 162 | } |
@@ -169,7 +169,7 @@ static int cs5535_dma_check(ide_drive_t *drive) | |||
169 | return 0; | 169 | return 0; |
170 | 170 | ||
171 | if (ide_use_fast_pio(drive)) | 171 | if (ide_use_fast_pio(drive)) |
172 | cs5535_tuneproc(drive, 255); | 172 | ide_set_max_pio(drive); |
173 | 173 | ||
174 | return -1; | 174 | return -1; |
175 | } | 175 | } |
@@ -198,7 +198,7 @@ static void __devinit init_hwif_cs5535(ide_hwif_t *hwif) | |||
198 | 198 | ||
199 | hwif->autodma = 0; | 199 | hwif->autodma = 0; |
200 | 200 | ||
201 | hwif->tuneproc = &cs5535_tuneproc; | 201 | hwif->set_pio_mode = &cs5535_set_pio_mode; |
202 | hwif->speedproc = &cs5535_set_drive; | 202 | hwif->speedproc = &cs5535_set_drive; |
203 | hwif->ide_dma_check = &cs5535_dma_check; | 203 | hwif->ide_dma_check = &cs5535_dma_check; |
204 | 204 | ||