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

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

IB/rxe: 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: Moni Shoua <monis@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent a62ef9a7

drivers/infiniband/sw/rxe/rxe_verbs.c

+3 −3
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int rxe_query_pkey(struct ib_device *device, 
	struct rxe_port *port;



	if (unlikely(port_num != 1)) {

		dev_warn(device->dma_device, "invalid port_num = %d\n",

		dev_warn(device->dev.parent, "invalid port_num = %d\n",

			 port_num);

		goto err1;

	}
@@ -176,7 +176,7 @@ static int rxe_query_pkey(struct ib_device *device, 
	port = &rxe->port;



	if (unlikely(index >= port->attr.pkey_tbl_len)) {

		dev_warn(device->dma_device, "invalid index = %d\n",

		dev_warn(device->dev.parent, "invalid index = %d\n",

			 index);

		goto err1;

	}
@@ -1232,7 +1232,7 @@ int rxe_register_device(struct rxe_dev *rxe) 
	dev->node_type = RDMA_NODE_IB_CA;

	dev->phys_port_cnt = 1;

	dev->num_comp_vectors = RXE_NUM_COMP_VECTORS;

	dev->dma_device = rxe_dma_device(rxe);

	dev->dev.parent = rxe_dma_device(rxe);

	dev->local_dma_lkey = 0;

	dev->node_guid = rxe_node_guid(rxe);

	dev->dma_ops = &rxe_dma_mapping_ops;