lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: use ide_destroy_dmatable() instead of pci_unmap_sg() (take 2)

Browse Source 
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>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2008-02-01 23:09:31 +01:00
parent fcc1175947
commit f6fb786d6d
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ide/ide-dma.c
View File

@@ -282,12 +282,12 @@ int ide_build_dmatable (ide_drive_t *drive, struct request *rq)
*--table |= cpu_to_le32(0x80000000); *--table |= cpu_to_le32(0x80000000);
return count; return count;
} }
printk(KERN_ERR "%s: empty DMA table?\n", drive->name); printk(KERN_ERR "%s: empty DMA table?\n", drive->name);
use_pio_instead: use_pio_instead:
pci_unmap_sg(hwif->pci_dev, ide_destroy_dmatable(drive);
hwif->sg_table,
hwif->sg_nents,
hwif->sg_dma_direction);
return 0; /* revert to PIO for this request */ return 0; /* revert to PIO for this request */
} }

3
drivers/ide/pci/sgiioc4.c
View File

@@ -517,8 +517,7 @@ sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir)
} }
use_pio_instead: use_pio_instead:
pci_unmap_sg(hwif->pci_dev, hwif->sg_table, hwif->sg_nents, ide_destroy_dmatable(drive);
hwif->sg_dma_direction);
return 0; /* revert to PIO for this request */ return 0; /* revert to PIO for this request */
} }

16
drivers/ide/ppc/pmac.c
View File

@@ -1535,11 +1535,10 @@ pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq)
} }
printk(KERN_DEBUG "%s: empty DMA table?\n", drive->name); printk(KERN_DEBUG "%s: empty DMA table?\n", drive->name);
use_pio_instead:
pci_unmap_sg(hwif->pci_dev, use_pio_instead:
hwif->sg_table, ide_destroy_dmatable(drive);
hwif->sg_nents,
hwif->sg_dma_direction);
return 0; /* revert to PIO for this request */ return 0; /* revert to PIO for this request */
} }
@@ -1548,12 +1547,9 @@ static void
pmac_ide_destroy_dmatable (ide_drive_t *drive) pmac_ide_destroy_dmatable (ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = HWIF(drive)->pci_dev;
struct scatterlist *sg = hwif->sg_table;
int nents = hwif->sg_nents;
if (nents) { if (hwif->sg_nents) {
pci_unmap_sg(dev, sg, nents, hwif->sg_dma_direction); ide_destroy_dmatable(drive);
hwif->sg_nents = 0; hwif->sg_nents = 0;
} }
} }