diff options
Diffstat (limited to 'drivers/ide/ide-dma.c')
| -rw-r--r-- | drivers/ide/ide-dma.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 219e6fb78dc6..ee58c88dee5a 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
| @@ -361,9 +361,6 @@ static int ide_tune_dma(ide_drive_t *drive) | |||
| 361 | if (__ide_dma_bad_drive(drive)) | 361 | if (__ide_dma_bad_drive(drive)) |
| 362 | return 0; | 362 | return 0; |
| 363 | 363 | ||
| 364 | if (ide_id_dma_bug(drive)) | ||
| 365 | return 0; | ||
| 366 | |||
| 367 | if (hwif->host_flags & IDE_HFLAG_TRUST_BIOS_FOR_DMA) | 364 | if (hwif->host_flags & IDE_HFLAG_TRUST_BIOS_FOR_DMA) |
| 368 | return config_drive_for_dma(drive); | 365 | return config_drive_for_dma(drive); |
| 369 | 366 | ||
| @@ -394,24 +391,6 @@ static int ide_dma_check(ide_drive_t *drive) | |||
| 394 | return -1; | 391 | return -1; |
| 395 | } | 392 | } |
| 396 | 393 | ||
| 397 | int ide_id_dma_bug(ide_drive_t *drive) | ||
| 398 | { | ||
| 399 | u16 *id = drive->id; | ||
| 400 | |||
| 401 | if (id[ATA_ID_FIELD_VALID] & 4) { | ||
| 402 | if ((id[ATA_ID_UDMA_MODES] >> 8) && | ||
| 403 | (id[ATA_ID_MWDMA_MODES] >> 8)) | ||
| 404 | goto err_out; | ||
| 405 | } else if ((id[ATA_ID_MWDMA_MODES] >> 8) && | ||
| 406 | (id[ATA_ID_SWDMA_MODES] >> 8)) | ||
| 407 | goto err_out; | ||
| 408 | |||
| 409 | return 0; | ||
| 410 | err_out: | ||
| 411 | printk(KERN_ERR "%s: bad DMA info in identify block\n", drive->name); | ||
| 412 | return 1; | ||
| 413 | } | ||
| 414 | |||
| 415 | int ide_set_dma(ide_drive_t *drive) | 394 | int ide_set_dma(ide_drive_t *drive) |
| 416 | { | 395 | { |
| 417 | int rc; | 396 | int rc; |
