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/triflex.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/triflex.c')
-rw-r--r-- | drivers/ide/pci/triflex.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c index 54e411d4e56c..921c41006df9 100644 --- a/drivers/ide/pci/triflex.c +++ b/drivers/ide/pci/triflex.c | |||
@@ -96,16 +96,6 @@ static void triflex_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
96 | triflex_set_mode(drive, XFER_PIO_0 + pio); | 96 | triflex_set_mode(drive, XFER_PIO_0 + pio); |
97 | } | 97 | } |
98 | 98 | ||
99 | static int triflex_config_drive_xfer_rate(ide_drive_t *drive) | ||
100 | { | ||
101 | if (ide_tune_dma(drive)) | ||
102 | return 0; | ||
103 | |||
104 | ide_set_max_pio(drive); | ||
105 | |||
106 | return -1; | ||
107 | } | ||
108 | |||
109 | static void __devinit init_hwif_triflex(ide_hwif_t *hwif) | 99 | static void __devinit init_hwif_triflex(ide_hwif_t *hwif) |
110 | { | 100 | { |
111 | hwif->set_pio_mode = &triflex_set_pio_mode; | 101 | hwif->set_pio_mode = &triflex_set_pio_mode; |
@@ -117,7 +107,6 @@ static void __devinit init_hwif_triflex(ide_hwif_t *hwif) | |||
117 | hwif->atapi_dma = 1; | 107 | hwif->atapi_dma = 1; |
118 | hwif->mwdma_mask = 0x07; | 108 | hwif->mwdma_mask = 0x07; |
119 | hwif->swdma_mask = 0x07; | 109 | hwif->swdma_mask = 0x07; |
120 | hwif->ide_dma_check = &triflex_config_drive_xfer_rate; | ||
121 | 110 | ||
122 | if (!noautodma) | 111 | if (!noautodma) |
123 | hwif->autodma = 1; | 112 | hwif->autodma = 1; |