Commit 01cd364a authored by Stephen Warren's avatar Stephen Warren Committed by David S. Miller
Browse files

net/mlx4: replace pci_{,un}map_sg with dma_{,un}map_sg 



pci_{,un}map_sg are deprecated and replaced by dma_{,un}map_sg. This is
especially relevant since the rest of the driver uses the DMA API. Fix
the driver to use the replacement APIs.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f65e192a

drivers/net/ethernet/mellanox/mlx4/icm.c

+7 −8
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ static void mlx4_free_icm_pages(struct mlx4_dev *dev, struct mlx4_icm_chunk *chu 
	int i;



	if (chunk->nsg > 0)

		pci_unmap_sg(dev->persist->pdev, chunk->sg, chunk->npages,

			     PCI_DMA_BIDIRECTIONAL);

		dma_unmap_sg(&dev->persist->pdev->dev, chunk->sg, chunk->npages,

			     DMA_BIDIRECTIONAL);



	for (i = 0; i < chunk->npages; ++i)

		__free_pages(sg_page(&chunk->sg[i]),
@@ -204,9 +204,9 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages, 
		if (coherent)

			++chunk->nsg;

		else if (chunk->npages == MLX4_ICM_CHUNK_LEN) {

			chunk->nsg = pci_map_sg(dev->persist->pdev, chunk->sg,

						chunk->npages,

						PCI_DMA_BIDIRECTIONAL);

			chunk->nsg = dma_map_sg(&dev->persist->pdev->dev,

						chunk->sg, chunk->npages,

						DMA_BIDIRECTIONAL);



			if (chunk->nsg <= 0)

				goto fail;
@@ -219,9 +219,8 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages, 
	}



	if (!coherent && chunk) {

		chunk->nsg = pci_map_sg(dev->persist->pdev, chunk->sg,

					chunk->npages,

					PCI_DMA_BIDIRECTIONAL);

		chunk->nsg = dma_map_sg(&dev->persist->pdev->dev, chunk->sg,

					chunk->npages, DMA_BIDIRECTIONAL);



		if (chunk->nsg <= 0)

			goto fail;

CRA Git | Maintained and supported by SUSTech CRA and CCSE