Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[karo-tx-linux.git] / drivers / infiniband / sw / rxe / rxe_verbs.c

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index 371ef3bac8d4c2b26b03d31d0072e76a3ba81ac5..d2e2eff7a515dd31ac5bd12cde06a80c5f806fcb 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -235,7 +235,7 @@ static enum rdma_link_layer rxe_get_link_layer(struct ib_device *dev,
 {
        struct rxe_dev *rxe = to_rdev(dev);
 
-       return rxe->ifc_ops->link_layer(rxe, port_num);
+       return rxe_link_layer(rxe, port_num);
 }
 
 static struct ib_ucontext *rxe_alloc_ucontext(struct ib_device *dev,
@@ -1211,10 +1211,8 @@ static ssize_t rxe_show_parent(struct device *device,
 {
        struct rxe_dev *rxe = container_of(device, struct rxe_dev,
                                           ib_dev.dev);
-       char *name;
 
-       name = rxe->ifc_ops->parent_name(rxe, 1);
-       return snprintf(buf, 16, "%s\n", name);
+       return snprintf(buf, 16, "%s\n", rxe_parent_name(rxe, 1));
 }
 
 static DEVICE_ATTR(parent, S_IRUGO, rxe_show_parent, NULL);
@@ -1236,9 +1234,9 @@ 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->ifc_ops->dma_device(rxe);
+       dev->dma_device = rxe_dma_device(rxe);
        dev->local_dma_lkey = 0;
-       dev->node_guid = rxe->ifc_ops->node_guid(rxe);
+       dev->node_guid = rxe_node_guid(rxe);
        dev->dma_ops = &rxe_dma_mapping_ops;
 
        dev->uverbs_abi_ver = RXE_UVERBS_ABI_VERSION;