Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6fb786d authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent fcc11759

drivers/ide/ide-dma.c

+4 −4
Original line number Diff line number Diff line
@@ -282,12 +282,12 @@ int ide_build_dmatable (ide_drive_t *drive, struct request *rq) 
			*--table |= cpu_to_le32(0x80000000);

		return count;

	}



	printk(KERN_ERR "%s: empty DMA table?\n", drive->name);



use_pio_instead:

	pci_unmap_sg(hwif->pci_dev,

		     hwif->sg_table,

		     hwif->sg_nents,

		     hwif->sg_dma_direction);

	ide_destroy_dmatable(drive);



	return 0; /* revert to PIO for this request */

}

drivers/ide/pci/sgiioc4.c

+1 −2
Original line number Diff line number Diff line
@@ -517,8 +517,7 @@ sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir) 
	}



use_pio_instead:

	pci_unmap_sg(hwif->pci_dev, hwif->sg_table, hwif->sg_nents,

		     hwif->sg_dma_direction);

	ide_destroy_dmatable(drive);



	return 0;		/* revert to PIO for this request */

}

drivers/ide/ppc/pmac.c

+6 −10
Original line number Diff line number Diff line
@@ -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);



use_pio_instead:

	pci_unmap_sg(hwif->pci_dev,

		     hwif->sg_table,

		     hwif->sg_nents,

		     hwif->sg_dma_direction);

	ide_destroy_dmatable(drive);



	return 0; /* revert to PIO for this request */

}
@@ -1548,12 +1547,9 @@ static void 
pmac_ide_destroy_dmatable (ide_drive_t *drive)

{

	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) {

		pci_unmap_sg(dev, sg, nents, hwif->sg_dma_direction);

	if (hwif->sg_nents) {

		ide_destroy_dmatable(drive);

		hwif->sg_nents = 0;

	}

}