diff options
Diffstat (limited to 'drivers/ide/pci/piix.c')
-rw-r--r-- | drivers/ide/pci/piix.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c index 84d3938a430a..8b219dd63024 100644 --- a/drivers/ide/pci/piix.c +++ b/drivers/ide/pci/piix.c | |||
@@ -304,30 +304,6 @@ static int piix_tune_chipset (ide_drive_t *drive, u8 xferspeed) | |||
304 | } | 304 | } |
305 | 305 | ||
306 | /** | 306 | /** |
307 | * piix_config_drive_for_dma - configure drive for DMA | ||
308 | * @drive: IDE drive to configure | ||
309 | * | ||
310 | * Set up a PIIX interface channel for the best available speed. | ||
311 | * We prefer UDMA if it is available and then MWDMA. If DMA is | ||
312 | * not available we switch to PIO and return 0. | ||
313 | */ | ||
314 | |||
315 | static int piix_config_drive_for_dma (ide_drive_t *drive) | ||
316 | { | ||
317 | u8 speed = ide_max_dma_mode(drive); | ||
318 | |||
319 | /* | ||
320 | * If no DMA speed was available or the chipset has DMA bugs | ||
321 | * then disable DMA and use PIO | ||
322 | */ | ||
323 | if (!speed) | ||
324 | return 0; | ||
325 | |||
326 | (void) piix_tune_chipset(drive, speed); | ||
327 | return ide_dma_enable(drive); | ||
328 | } | ||
329 | |||
330 | /** | ||
331 | * piix_config_drive_xfer_rate - set up an IDE device | 307 | * piix_config_drive_xfer_rate - set up an IDE device |
332 | * @drive: IDE drive to configure | 308 | * @drive: IDE drive to configure |
333 | * | 309 | * |
@@ -339,7 +315,7 @@ static int piix_config_drive_xfer_rate (ide_drive_t *drive) | |||
339 | { | 315 | { |
340 | drive->init_speed = 0; | 316 | drive->init_speed = 0; |
341 | 317 | ||
342 | if (ide_use_dma(drive) && piix_config_drive_for_dma(drive)) | 318 | if (ide_tune_dma(drive)) |
343 | return 0; | 319 | return 0; |
344 | 320 | ||
345 | if (ide_use_fast_pio(drive)) | 321 | if (ide_use_fast_pio(drive)) |