diff options
Diffstat (limited to 'drivers/ide/pci/cs5535.c')
-rw-r--r-- | drivers/ide/pci/cs5535.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c index 10f61f38243c..ce44e38390aa 100644 --- a/drivers/ide/pci/cs5535.c +++ b/drivers/ide/pci/cs5535.c | |||
@@ -89,7 +89,7 @@ static void cs5535_set_speed(ide_drive_t *drive, u8 speed) | |||
89 | 89 | ||
90 | pioa = speed - XFER_PIO_0; | 90 | pioa = speed - XFER_PIO_0; |
91 | piob = ide_get_best_pio_mode(&(drive->hwif->drives[!unit]), | 91 | piob = ide_get_best_pio_mode(&(drive->hwif->drives[!unit]), |
92 | 255, 4, NULL); | 92 | 255, 4); |
93 | cmd = pioa < piob ? pioa : piob; | 93 | cmd = pioa < piob ? pioa : piob; |
94 | 94 | ||
95 | /* Write the speed of the current drive */ | 95 | /* Write the speed of the current drive */ |
@@ -159,7 +159,7 @@ static void cs5535_tuneproc(ide_drive_t *drive, u8 xferspeed) | |||
159 | /* cs5535 max pio is pio 4, best_pio will check the blacklist. | 159 | /* cs5535 max pio is pio 4, best_pio will check the blacklist. |
160 | i think we don't need to rate_filter the incoming xferspeed | 160 | i think we don't need to rate_filter the incoming xferspeed |
161 | since we know we're only going to choose pio */ | 161 | since we know we're only going to choose pio */ |
162 | xferspeed = ide_get_best_pio_mode(drive, xferspeed, 4, NULL); | 162 | xferspeed = ide_get_best_pio_mode(drive, xferspeed, 4); |
163 | ide_config_drive_speed(drive, modes[xferspeed]); | 163 | ide_config_drive_speed(drive, modes[xferspeed]); |
164 | cs5535_set_speed(drive, xferspeed); | 164 | cs5535_set_speed(drive, xferspeed); |
165 | } | 165 | } |
@@ -174,7 +174,7 @@ static int cs5535_dma_check(ide_drive_t *drive) | |||
174 | return 0; | 174 | return 0; |
175 | 175 | ||
176 | if (ide_use_fast_pio(drive)) { | 176 | if (ide_use_fast_pio(drive)) { |
177 | speed = ide_get_best_pio_mode(drive, 255, 4, NULL); | 177 | speed = ide_get_best_pio_mode(drive, 255, 4); |
178 | cs5535_set_drive(drive, speed); | 178 | cs5535_set_drive(drive, speed); |
179 | } | 179 | } |
180 | 180 | ||
@@ -228,9 +228,10 @@ static void __devinit init_hwif_cs5535(ide_hwif_t *hwif) | |||
228 | static ide_pci_device_t cs5535_chipset __devinitdata = { | 228 | static ide_pci_device_t cs5535_chipset __devinitdata = { |
229 | .name = "CS5535", | 229 | .name = "CS5535", |
230 | .init_hwif = init_hwif_cs5535, | 230 | .init_hwif = init_hwif_cs5535, |
231 | .channels = 1, | ||
232 | .autodma = AUTODMA, | 231 | .autodma = AUTODMA, |
233 | .bootable = ON_BOARD, | 232 | .bootable = ON_BOARD, |
233 | .host_flags = IDE_HFLAG_SINGLE, | ||
234 | .pio_mask = ATA_PIO4, | ||
234 | }; | 235 | }; |
235 | 236 | ||
236 | static int __devinit cs5535_init_one(struct pci_dev *dev, | 237 | static int __devinit cs5535_init_one(struct pci_dev *dev, |