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

Commit d66c88a8 authored by Bart Van Assche's avatar Bart Van Assche Committed by Doug Ledford
Browse files

IB/mlx4: Switch from dma_device to dev.parent 



Prepare for removal of ib_device.dma_device.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Cc: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent f2296adc

drivers/infiniband/hw/mlx4/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2625,7 +2625,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	ibdev->ib_dev.phys_port_cnt     = mlx4_is_bonded(dev) ?

						1 : ibdev->num_ports;

	ibdev->ib_dev.num_comp_vectors	= dev->caps.num_comp_vectors;

	ibdev->ib_dev.dma_device	= &dev->persist->pdev->dev;

	ibdev->ib_dev.dev.parent	= &dev->persist->pdev->dev;

	ibdev->ib_dev.get_netdev	= mlx4_ib_get_netdev;

	ibdev->ib_dev.add_gid		= mlx4_ib_add_gid;

	ibdev->ib_dev.del_gid		= mlx4_ib_del_gid;

drivers/infiniband/hw/mlx4/mlx4_ib.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#define pr_fmt(fmt)	"<" MLX4_IB_DRV_NAME "> %s: " fmt, __func__



#define mlx4_ib_warn(ibdev, format, arg...) \

	dev_warn((ibdev)->dma_device, MLX4_IB_DRV_NAME ": " format, ## arg)

	dev_warn((ibdev)->dev.parent, MLX4_IB_DRV_NAME ": " format, ## arg)



enum {

	MLX4_IB_SQ_MIN_WQE_SHIFT = 6,

drivers/infiniband/hw/mlx4/mr.c

+3 −3
Original line number Diff line number Diff line
@@ -292,10 +292,10 @@ mlx4_alloc_priv_pages(struct ib_device *device, 
	if (!mr->pages)

		return -ENOMEM;



	mr->page_map = dma_map_single(device->dma_device, mr->pages,

	mr->page_map = dma_map_single(device->dev.parent, mr->pages,

				      mr->page_map_size, DMA_TO_DEVICE);



	if (dma_mapping_error(device->dma_device, mr->page_map)) {

	if (dma_mapping_error(device->dev.parent, mr->page_map)) {

		ret = -ENOMEM;

		goto err;

	}
@@ -313,7 +313,7 @@ mlx4_free_priv_pages(struct mlx4_ib_mr *mr) 
	if (mr->pages) {

		struct ib_device *device = mr->ibmr.device;



		dma_unmap_single(device->dma_device, mr->page_map,

		dma_unmap_single(device->dev.parent, mr->page_map,

				 mr->page_map_size, DMA_TO_DEVICE);

		free_page((unsigned long)mr->pages);

		mr->pages = NULL;