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/hpt34x.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/hpt34x.c')
-rw-r--r-- | drivers/ide/pci/hpt34x.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index 69724887225c..449132583bb4 100644 --- a/drivers/ide/pci/hpt34x.c +++ b/drivers/ide/pci/hpt34x.c | |||
@@ -80,16 +80,6 @@ static void hpt34x_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
80 | hpt34x_set_mode(drive, XFER_PIO_0 + pio); | 80 | hpt34x_set_mode(drive, XFER_PIO_0 + pio); |
81 | } | 81 | } |
82 | 82 | ||
83 | static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive) | ||
84 | { | ||
85 | if (ide_tune_dma(drive)) | ||
86 | return -1; | ||
87 | |||
88 | ide_set_max_pio(drive); | ||
89 | |||
90 | return -1; | ||
91 | } | ||
92 | |||
93 | /* | 83 | /* |
94 | * If the BIOS does not set the IO base addaress to XX00, 343 will fail. | 84 | * If the BIOS does not set the IO base addaress to XX00, 343 will fail. |
95 | */ | 85 | */ |
@@ -156,7 +146,6 @@ static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif) | |||
156 | hwif->swdma_mask = 0x07; | 146 | hwif->swdma_mask = 0x07; |
157 | #endif | 147 | #endif |
158 | 148 | ||
159 | hwif->ide_dma_check = &hpt34x_config_drive_xfer_rate; | ||
160 | if (!noautodma) | 149 | if (!noautodma) |
161 | hwif->autodma = (pcicmd & PCI_COMMAND_MEMORY) ? 1 : 0; | 150 | hwif->autodma = (pcicmd & PCI_COMMAND_MEMORY) ? 1 : 0; |
162 | hwif->drives[0].autodma = hwif->autodma; | 151 | hwif->drives[0].autodma = hwif->autodma; |