diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:24 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:24 -0400 |
commit | 5e37bdc081a980dd0d669e6387bcf15ca9666f81 (patch) | |
tree | d842166c3bd23fbf3dfba0ccaa0f9ed5cc3096db /drivers/ide/arm | |
parent | 1fd1890594bd355a4217f5658a34763e77decee3 (diff) |
ide: add struct ide_dma_ops (take 3)
Add struct ide_dma_ops and convert core code + drivers to use it.
While at it:
* Drop "ide_" prefix from ->ide_dma_end and ->ide_dma_test_irq methods.
* Drop "ide_" "infixes" from DMA methods.
* au1xxx-ide.c:
- use auide_dma_{test_irq,end}() directly in auide_dma_timeout()
* pdc202xx_old.c:
- drop "old_" "infixes" from DMA methods
* siimage.c:
- add siimage_dma_test_irq() helper
- print SATA warning in siimage_init_one()
* Remove no longer needed ->init_hwif implementations.
v2:
* Changes based on review from Sergei:
- s/siimage_ide_dma_test_irq/siimage_dma_test_irq/
- s/drive->hwif/hwif/ in idefloppy_pc_intr().
- fix patch description w.r.t. au1xxx-ide changes
- fix au1xxx-ide build
- fix naming for cmd64*_dma_ops
- drop "ide_" and "old_" infixes
- s/hpt3xxx_dma_ops/hpt37x_dma_ops/
- s/hpt370x_dma_ops/hpt370_dma_ops/
- use correct DMA ops for HPT302/N, HPT371/N and HPT374
- s/it821x_smart_dma_ops/it821x_pass_through_dma_ops/
v3:
* Two bugs slipped in v2 (noticed by Sergei):
- use correct DMA ops for HPT374 (for real this time)
- handle HPT370/HPT370A properly
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/arm')
-rw-r--r-- | drivers/ide/arm/icside.c | 24 | ||||
-rw-r--r-- | drivers/ide/arm/palm_bk3710.c | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index 9118587a0db8..adfeed45f4c0 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c | |||
@@ -389,17 +389,21 @@ static int icside_dma_init(ide_hwif_t *hwif, const struct ide_port_info *d) | |||
389 | hwif->dmatable_cpu = NULL; | 389 | hwif->dmatable_cpu = NULL; |
390 | hwif->dmatable_dma = 0; | 390 | hwif->dmatable_dma = 0; |
391 | 391 | ||
392 | hwif->dma_host_set = icside_dma_host_set; | ||
393 | hwif->dma_setup = icside_dma_setup; | ||
394 | hwif->dma_exec_cmd = icside_dma_exec_cmd; | ||
395 | hwif->dma_start = icside_dma_start; | ||
396 | hwif->ide_dma_end = icside_dma_end; | ||
397 | hwif->ide_dma_test_irq = icside_dma_test_irq; | ||
398 | hwif->dma_timeout = icside_dma_timeout; | ||
399 | hwif->dma_lost_irq = icside_dma_lost_irq; | ||
400 | |||
401 | return 0; | 392 | return 0; |
402 | } | 393 | } |
394 | |||
395 | static struct ide_dma_ops icside_v6_dma_ops = { | ||
396 | .dma_host_set = icside_dma_host_set, | ||
397 | .dma_setup = icside_dma_setup, | ||
398 | .dma_exec_cmd = icside_dma_exec_cmd, | ||
399 | .dma_start = icside_dma_start, | ||
400 | .dma_end = icside_dma_end, | ||
401 | .dma_test_irq = icside_dma_test_irq, | ||
402 | .dma_timeout = icside_dma_timeout, | ||
403 | .dma_lost_irq = icside_dma_lost_irq, | ||
404 | }; | ||
405 | #else | ||
406 | #define icside_v6_dma_ops NULL | ||
403 | #endif | 407 | #endif |
404 | 408 | ||
405 | static int icside_dma_off_init(ide_hwif_t *hwif, const struct ide_port_info *d) | 409 | static int icside_dma_off_init(ide_hwif_t *hwif, const struct ide_port_info *d) |
@@ -475,6 +479,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec) | |||
475 | static const struct ide_port_info icside_v6_port_info __initdata = { | 479 | static const struct ide_port_info icside_v6_port_info __initdata = { |
476 | .init_dma = icside_dma_off_init, | 480 | .init_dma = icside_dma_off_init, |
477 | .port_ops = &icside_v6_no_dma_port_ops, | 481 | .port_ops = &icside_v6_no_dma_port_ops, |
482 | .dma_ops = &icside_v6_dma_ops, | ||
478 | .host_flags = IDE_HFLAG_SERIALIZE | | 483 | .host_flags = IDE_HFLAG_SERIALIZE | |
479 | IDE_HFLAG_NO_AUTOTUNE, | 484 | IDE_HFLAG_NO_AUTOTUNE, |
480 | .mwdma_mask = ATA_MWDMA2, | 485 | .mwdma_mask = ATA_MWDMA2, |
@@ -550,6 +555,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) | |||
550 | if (ec->dma != NO_DMA && !request_dma(ec->dma, hwif->name)) { | 555 | if (ec->dma != NO_DMA && !request_dma(ec->dma, hwif->name)) { |
551 | d.init_dma = icside_dma_init; | 556 | d.init_dma = icside_dma_init; |
552 | d.port_ops = &icside_v6_dma_port_ops; | 557 | d.port_ops = &icside_v6_dma_port_ops; |
558 | d.dma_ops = NULL; | ||
553 | } | 559 | } |
554 | 560 | ||
555 | idx[0] = hwif->index; | 561 | idx[0] = hwif->index; |
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c index 8fa34e26443a..5853f1109807 100644 --- a/drivers/ide/arm/palm_bk3710.c +++ b/drivers/ide/arm/palm_bk3710.c | |||
@@ -328,7 +328,7 @@ static int __devinit palm_bk3710_init_dma(ide_hwif_t *hwif, | |||
328 | if (ide_allocate_dma_engine(hwif)) | 328 | if (ide_allocate_dma_engine(hwif)) |
329 | return -1; | 329 | return -1; |
330 | 330 | ||
331 | ide_setup_dma(hwif, base); | 331 | ide_setup_dma(hwif, base, d); |
332 | 332 | ||
333 | return 0; | 333 | return 0; |
334 | } | 334 | } |