diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:31 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:31 -0500 |
commit | f6fb786d6dcdd7d730e4fba620b071796f487e1b (patch) | |
tree | f1f8368fecee874caf487a95b1cfa2adcdfc0df6 /drivers/ide/pci/sgiioc4.c | |
parent | fcc1175947510d7d7dc82d5c1b8315cb8fcb96ca (diff) |
ide: use ide_destroy_dmatable() instead of pci_unmap_sg() (take 2)
Use ide_destroy_dmatable() in:
* ide-dma.c::ide_build_dmatable()
* sgiioc4.c::sgiioc4_build_dma_table()
* pmac.c::pmac_ide_{build,destroy}_dmatable()
There should be no functionality changes caused by this patch.
v2:
* pmac.c build fix from Andrew Morton.
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/sgiioc4.c')
-rw-r--r-- | drivers/ide/pci/sgiioc4.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index 9e0be7d54980..b60a5e8860cd 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -517,8 +517,7 @@ sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir) | |||
517 | } | 517 | } |
518 | 518 | ||
519 | use_pio_instead: | 519 | use_pio_instead: |
520 | pci_unmap_sg(hwif->pci_dev, hwif->sg_table, hwif->sg_nents, | 520 | ide_destroy_dmatable(drive); |
521 | hwif->sg_dma_direction); | ||
522 | 521 | ||
523 | return 0; /* revert to PIO for this request */ | 522 | return 0; /* revert to PIO for this request */ |
524 | } | 523 | } |