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/sis5513.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/sis5513.c')
-rw-r--r-- | drivers/ide/pci/sis5513.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index 5458c56e69b0..45666b45231a 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c | |||
@@ -601,16 +601,6 @@ static void sis_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
601 | } | 601 | } |
602 | } | 602 | } |
603 | 603 | ||
604 | static int sis5513_config_xfer_rate(ide_drive_t *drive) | ||
605 | { | ||
606 | if (ide_tune_dma(drive)) | ||
607 | return 0; | ||
608 | |||
609 | ide_set_max_pio(drive); | ||
610 | |||
611 | return -1; | ||
612 | } | ||
613 | |||
614 | static u8 sis5513_ata133_udma_filter(ide_drive_t *drive) | 604 | static u8 sis5513_ata133_udma_filter(ide_drive_t *drive) |
615 | { | 605 | { |
616 | struct pci_dev *dev = drive->hwif->pci_dev; | 606 | struct pci_dev *dev = drive->hwif->pci_dev; |
@@ -847,8 +837,6 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif) | |||
847 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) | 837 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) |
848 | hwif->cbl = ata66_sis5513(hwif); | 838 | hwif->cbl = ata66_sis5513(hwif); |
849 | 839 | ||
850 | hwif->ide_dma_check = &sis5513_config_xfer_rate; | ||
851 | |||
852 | if (!noautodma) | 840 | if (!noautodma) |
853 | hwif->autodma = 1; | 841 | hwif->autodma = 1; |
854 | 842 | ||