diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2009-01-06 11:21:01 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-01-06 11:21:01 -0500 |
commit | 3f023b0138b7db21bac0074b3d5ca2854372c6ff (patch) | |
tree | 3142f3c13640c040d12bc4335635cd544be41760 /drivers/ide/alim15x3.c | |
parent | 391ad1908a9c13d457ea12ce1508d6b8a7ba72ad (diff) |
ide: don't set hwif->dma_ops in init_dma() method
Replace setting of 'hwif->dma_ops' in the 'alim15x3' and 'palm_bk3710' drivers'
init_dma() methods with initializing the corresponding member of their 'struct
ide_port_info' instances and remove such setting from the 'hpt366' driver that
just doesn't use 'sff_dma_ops'. Along with some code save, this prepares us for
the next patch...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/alim15x3.c')
-rw-r--r-- | drivers/ide/alim15x3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c index 8d217430c997..f1c817240501 100644 --- a/drivers/ide/alim15x3.c +++ b/drivers/ide/alim15x3.c | |||
@@ -490,8 +490,6 @@ static int __devinit init_dma_ali15x3(ide_hwif_t *hwif, | |||
490 | if (ide_allocate_dma_engine(hwif)) | 490 | if (ide_allocate_dma_engine(hwif)) |
491 | return -1; | 491 | return -1; |
492 | 492 | ||
493 | hwif->dma_ops = &sff_dma_ops; | ||
494 | |||
495 | return 0; | 493 | return 0; |
496 | } | 494 | } |
497 | 495 | ||
@@ -519,6 +517,7 @@ static const struct ide_port_info ali15x3_chipset __devinitdata = { | |||
519 | .init_hwif = init_hwif_ali15x3, | 517 | .init_hwif = init_hwif_ali15x3, |
520 | .init_dma = init_dma_ali15x3, | 518 | .init_dma = init_dma_ali15x3, |
521 | .port_ops = &ali_port_ops, | 519 | .port_ops = &ali_port_ops, |
520 | .dma_ops = &sff_dma_ops, | ||
522 | .pio_mask = ATA_PIO5, | 521 | .pio_mask = ATA_PIO5, |
523 | .swdma_mask = ATA_SWDMA2, | 522 | .swdma_mask = ATA_SWDMA2, |
524 | .mwdma_mask = ATA_MWDMA2, | 523 | .mwdma_mask = ATA_MWDMA2, |