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/atiixp.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/atiixp.c')
-rw-r--r-- | drivers/ide/pci/atiixp.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c index b457df883dcb..1dfd068daf76 100644 --- a/drivers/ide/pci/atiixp.c +++ b/drivers/ide/pci/atiixp.c | |||
@@ -159,24 +159,6 @@ static void atiixp_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
159 | } | 159 | } |
160 | 160 | ||
161 | /** | 161 | /** |
162 | * atiixp_dma_check - set up an IDE device | ||
163 | * @drive: IDE drive to configure | ||
164 | * | ||
165 | * Set up the ATIIXP interface for the best available speed on this | ||
166 | * interface, preferring DMA to PIO. | ||
167 | */ | ||
168 | |||
169 | static int atiixp_dma_check(ide_drive_t *drive) | ||
170 | { | ||
171 | if (ide_tune_dma(drive)) | ||
172 | return 0; | ||
173 | |||
174 | ide_set_max_pio(drive); | ||
175 | |||
176 | return -1; | ||
177 | } | ||
178 | |||
179 | /** | ||
180 | * init_hwif_atiixp - fill in the hwif for the ATIIXP | 162 | * init_hwif_atiixp - fill in the hwif for the ATIIXP |
181 | * @hwif: IDE interface | 163 | * @hwif: IDE interface |
182 | * | 164 | * |
@@ -215,7 +197,7 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif) | |||
215 | 197 | ||
216 | hwif->dma_host_on = &atiixp_dma_host_on; | 198 | hwif->dma_host_on = &atiixp_dma_host_on; |
217 | hwif->dma_host_off = &atiixp_dma_host_off; | 199 | hwif->dma_host_off = &atiixp_dma_host_off; |
218 | hwif->ide_dma_check = &atiixp_dma_check; | 200 | |
219 | if (!noautodma) | 201 | if (!noautodma) |
220 | hwif->autodma = 1; | 202 | hwif->autodma = 1; |
221 | 203 | ||