diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-16 16:29:55 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-16 16:29:55 -0400 |
commit | 0ae2e178652753ae1797d407755a3505f7c1d2a7 (patch) | |
tree | fa725edcfb4b9752ebf2aa49a3e42e158537d4ed /drivers/ide/pci/alim15x3.c | |
parent | b8b739d3361c16773a30fe5c0360336bbc19f435 (diff) |
ide: remove ->ide_dma_check (take 2)
* Add IDE_HFLAG_TRUST_BIOS_FOR_DMA host flag for host drivers that depend
on BIOS for programming device/controller for DMA. Set it in cy82c693,
generic, ns87415, opti621 and trm290 host drivers.
* Add IDE_HFLAG_VDMA host flag for host drivers using VDMA. Set it in cs5520
host driver.
* Teach ide_tune_dma() about IDE_HFLAG_TRUST_BIOS_FOR_DMA flag.
* Add generic ide_dma_check() helper and remove all open coded ->ide_dma_check
implementations. Fix all places checking for presence of ->ide_dma_check
hook to check for ->ide_dma_on instead.
* Remove no longer needed code from config_drive_for_dma().
* Make ide_tune_dma() static.
v2:
* Fix config_drive_for_dma() return values.
* Fix ide-dma.c build for CONFIG_BLK_DEV_IDEDMA_PCI=n by adding
dummy config_drive_for_dma() inline.
* Fix IDE_HFLAG_TRUST_BIOS_FOR_DMA handling in ide_dma_check().
* Fix init_hwif_it8213() comment.
There should be no functionality changes caused by this patch.
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/alim15x3.c')
-rw-r--r-- | drivers/ide/pci/alim15x3.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 9582794eb65a..64b28cadb2b4 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
@@ -437,24 +437,6 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
437 | } | 437 | } |
438 | 438 | ||
439 | /** | 439 | /** |
440 | * ali15x3_config_drive_for_dma - configure for DMA | ||
441 | * @drive: drive to configure | ||
442 | * | ||
443 | * Configure a drive for DMA operation. If DMA is not possible we | ||
444 | * drop the drive into PIO mode instead. | ||
445 | */ | ||
446 | |||
447 | static int ali15x3_config_drive_for_dma(ide_drive_t *drive) | ||
448 | { | ||
449 | if (ide_tune_dma(drive)) | ||
450 | return 0; | ||
451 | |||
452 | ide_set_max_pio(drive); | ||
453 | |||
454 | return -1; | ||
455 | } | ||
456 | |||
457 | /** | ||
458 | * ali15x3_dma_setup - begin a DMA phase | 440 | * ali15x3_dma_setup - begin a DMA phase |
459 | * @drive: target device | 441 | * @drive: target device |
460 | * | 442 | * |
@@ -713,7 +695,6 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif) | |||
713 | hwif->mwdma_mask = 0x07; | 695 | hwif->mwdma_mask = 0x07; |
714 | hwif->swdma_mask = 0x07; | 696 | hwif->swdma_mask = 0x07; |
715 | 697 | ||
716 | hwif->ide_dma_check = &ali15x3_config_drive_for_dma; | ||
717 | hwif->dma_setup = &ali15x3_dma_setup; | 698 | hwif->dma_setup = &ali15x3_dma_setup; |
718 | 699 | ||
719 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) | 700 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) |