renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
Code

scsi: mesh: switch to generic DMA API

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

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Christoph Hellwig 2018-10-11 10:17:35 +02:00 committed by Martin K. Petersen
parent 32e76961dd
commit 6c714d4425
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/scsi/mesh.c
View File

@ -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 /* We use the PCI APIs for now until the generic one gets fixed
* enough or until we get some macio-specific versions * enough or until we get some macio-specific versions
*/ */
dma_cmd_space = pci_zalloc_consistent(macio_get_pci_dev(mdev), dma_cmd_space = dma_zalloc_coherent(&macio_get_pci_dev(mdev)->dev,
ms->dma_cmd_size, &dma_cmd_bus); ms->dma_cmd_size, &dma_cmd_bus, GFP_KERNEL);
if (dma_cmd_space == NULL) { if (dma_cmd_space == NULL) {
printk(KERN_ERR "mesh: can't allocate DMA table\n"); printk(KERN_ERR "mesh: can't allocate DMA table\n");
goto out_unmap; goto out_unmap;
@ -1974,7 +1974,7 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
*/ */
mesh_shutdown(mdev); mesh_shutdown(mdev);
set_mesh_power(ms, 0); 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); ms->dma_cmd_space, ms->dma_cmd_bus);
out_unmap: out_unmap:
iounmap(ms->dma); iounmap(ms->dma);
@ -2007,7 +2007,7 @@ static int mesh_remove(struct macio_dev *mdev)
iounmap(ms->dma); iounmap(ms->dma);
/* Free DMA commands memory */ /* 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); ms->dma_cmd_space, ms->dma_cmd_bus);
/* Release memory resources */ /* Release memory resources */