diff options
author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-01-20 16:04:29 -0500 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-01-24 12:26:17 -0500 |
commit | 85e9f1dbbd1422805fb83bd391fc8ebba1087591 (patch) | |
tree | 8bedda3916d911ab016fccf0fc42c4e0ab53b4c6 | |
parent | a62ef9a7d2542fff44f9ca68a730e3d1677b7040 (diff) |
IB/rxe: Switch from dma_device to dev.parent
Prepare for removal of ib_device.dma_device.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Moni Shoua <monis@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r-- | drivers/infiniband/sw/rxe/rxe_verbs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c index e4de37fb9aab..ace58ef8538e 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.c +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c | |||
@@ -168,7 +168,7 @@ static int rxe_query_pkey(struct ib_device *device, | |||
168 | struct rxe_port *port; | 168 | struct rxe_port *port; |
169 | 169 | ||
170 | if (unlikely(port_num != 1)) { | 170 | if (unlikely(port_num != 1)) { |
171 | dev_warn(device->dma_device, "invalid port_num = %d\n", | 171 | dev_warn(device->dev.parent, "invalid port_num = %d\n", |
172 | port_num); | 172 | port_num); |
173 | goto err1; | 173 | goto err1; |
174 | } | 174 | } |
@@ -176,7 +176,7 @@ static int rxe_query_pkey(struct ib_device *device, | |||
176 | port = &rxe->port; | 176 | port = &rxe->port; |
177 | 177 | ||
178 | if (unlikely(index >= port->attr.pkey_tbl_len)) { | 178 | if (unlikely(index >= port->attr.pkey_tbl_len)) { |
179 | dev_warn(device->dma_device, "invalid index = %d\n", | 179 | dev_warn(device->dev.parent, "invalid index = %d\n", |
180 | index); | 180 | index); |
181 | goto err1; | 181 | goto err1; |
182 | } | 182 | } |
@@ -1232,7 +1232,7 @@ int rxe_register_device(struct rxe_dev *rxe) | |||
1232 | dev->node_type = RDMA_NODE_IB_CA; | 1232 | dev->node_type = RDMA_NODE_IB_CA; |
1233 | dev->phys_port_cnt = 1; | 1233 | dev->phys_port_cnt = 1; |
1234 | dev->num_comp_vectors = RXE_NUM_COMP_VECTORS; | 1234 | dev->num_comp_vectors = RXE_NUM_COMP_VECTORS; |
1235 | dev->dma_device = rxe_dma_device(rxe); | 1235 | dev->dev.parent = rxe_dma_device(rxe); |
1236 | dev->local_dma_lkey = 0; | 1236 | dev->local_dma_lkey = 0; |
1237 | dev->node_guid = rxe_node_guid(rxe); | 1237 | dev->node_guid = rxe_node_guid(rxe); |
1238 | dev->dma_ops = &rxe_dma_mapping_ops; | 1238 | dev->dma_ops = &rxe_dma_mapping_ops; |