]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
IB/rxe: Switch from dma_device to dev.parent
authorBart Van Assche <bart.vanassche@sandisk.com>
Fri, 20 Jan 2017 21:04:29 +0000 (13:04 -0800)
committerDoug Ledford <dledford@redhat.com>
Tue, 24 Jan 2017 17:26:17 +0000 (12:26 -0500)
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>
drivers/infiniband/sw/rxe/rxe_verbs.c

index e4de37fb9aabc0d634f0c95a2045a248e00a8f04..ace58ef8538eab8e5687977236ca82f09b4caf54 100644 (file)
@@ -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;