Commit 6c714d44 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: mesh: switch to generic DMA API 



Switch from the legacy PCI DMA API to the generic DMA API.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 32e76961

drivers/scsi/mesh.c

+4 −4
Original line number Diff line number Diff line
@@ -1915,8 +1915,8 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match) 
	/* We use the PCI APIs for now until the generic one gets fixed

	 * enough or until we get some macio-specific versions

	 */

	dma_cmd_space = pci_zalloc_consistent(macio_get_pci_dev(mdev),

					      ms->dma_cmd_size, &dma_cmd_bus);

	dma_cmd_space = dma_zalloc_coherent(&macio_get_pci_dev(mdev)->dev,

			ms->dma_cmd_size, &dma_cmd_bus, GFP_KERNEL);

	if (dma_cmd_space == NULL) {

		printk(KERN_ERR "mesh: can't allocate DMA table\n");

		goto out_unmap;
@@ -1974,7 +1974,7 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match) 
	 */

	mesh_shutdown(mdev);

	set_mesh_power(ms, 0);

	pci_free_consistent(macio_get_pci_dev(mdev), ms->dma_cmd_size,

	dma_free_coherent(&macio_get_pci_dev(mdev)->dev, ms->dma_cmd_size,

			    ms->dma_cmd_space, ms->dma_cmd_bus);

 out_unmap:

	iounmap(ms->dma);
@@ -2007,7 +2007,7 @@ static int mesh_remove(struct macio_dev *mdev) 
       	iounmap(ms->dma);



	/* Free DMA commands memory */

	pci_free_consistent(macio_get_pci_dev(mdev), ms->dma_cmd_size,

	dma_free_coherent(&macio_get_pci_dev(mdev)->dev, ms->dma_cmd_size,

			    ms->dma_cmd_space, ms->dma_cmd_bus);



	/* Release memory resources */