On 1/20/17, 4:04 PM, "linux-rdma-owner@xxxxxxxxxxxxxxx on behalf of Bart Van Assche" <linux-rdma-owner@xxxxxxxxxxxxxxx on behalf of bart.vanassche@xxxxxxxxxxx> wrote: >Prepare for removal of ib_device.dma_device. > >Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> >Cc: Moni Shoua <monis@xxxxxxxxxxxx> >--- > drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > >@@ -1234,7 +1234,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->ifc_ops->dma_device(rxe); >+ dev->dev.parent = rxe->ifc_ops->dma_device(rxe); > dev->local_dma_lkey = 0; > dev->node_guid = rxe->ifc_ops->node_guid(rxe); > dev->dma_ops = &rxe_dma_mapping_ops; ifc_ops was recently removed, so this will be a minor merge conflict. Reviewed-by: Andrew Boyer <andrew.boyer@xxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
