From: Ira Weiny Date: Tue, 19 Jan 2016 22:41:44 +0000 (-0800) Subject: staging/rdma/hfi1: Consolidate dma ops for hfi1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f326674ae374e08b34d8b02b2357bad4ef07317c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git staging/rdma/hfi1: Consolidate dma ops for hfi1 Remove the dma.c file from hfi1 in favor of using that which is present in rdmavt. Reviewed-by: Ira Weiny Reviewed-by: Mike Marciniszyn Signed-off-by: Dennis Dalessandro Signed-off-by: Doug Ledford --- diff --git a/drivers/staging/rdma/hfi1/Makefile b/drivers/staging/rdma/hfi1/Makefile index e63251b9c56b..69fb10f6a111 100644 --- a/drivers/staging/rdma/hfi1/Makefile +++ b/drivers/staging/rdma/hfi1/Makefile @@ -7,7 +7,7 @@ # obj-$(CONFIG_INFINIBAND_HFI1) += hfi1.o -hfi1-y := chip.o cq.o device.o diag.o dma.o driver.o efivar.o eprom.o file_ops.o firmware.o \ +hfi1-y := chip.o cq.o device.o diag.o driver.o efivar.o eprom.o file_ops.o firmware.o \ init.o intr.o keys.o mad.o mmap.o mr.o pcie.o pio.o pio_copy.o \ qp.o qsfp.o rc.o ruc.o sdma.o srq.o sysfs.o trace.o twsi.o \ uc.o ud.o user_exp_rcv.o user_pages.o user_sdma.o verbs_mcast.o verbs.o diff --git a/drivers/staging/rdma/hfi1/verbs.c b/drivers/staging/rdma/hfi1/verbs.c index 5e2113244e6d..347409ef3b1e 100644 --- a/drivers/staging/rdma/hfi1/verbs.c +++ b/drivers/staging/rdma/hfi1/verbs.c @@ -2063,7 +2063,7 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd) ibdev->detach_mcast = hfi1_multicast_detach; ibdev->process_mad = hfi1_process_mad; ibdev->mmap = hfi1_mmap; - ibdev->dma_ops = &hfi1_dma_mapping_ops; + ibdev->dma_ops = NULL; ibdev->get_port_immutable = port_immutable; strncpy(ibdev->node_desc, init_utsname()->nodename, diff --git a/drivers/staging/rdma/hfi1/verbs.h b/drivers/staging/rdma/hfi1/verbs.h index 58fb122509b1..a505545ed703 100644 --- a/drivers/staging/rdma/hfi1/verbs.h +++ b/drivers/staging/rdma/hfi1/verbs.h @@ -1151,6 +1151,4 @@ extern unsigned int hfi1_max_srq_wrs; extern const u32 ib_hfi1_rnr_table[]; -extern struct ib_dma_mapping_ops hfi1_dma_mapping_ops; - #endif /* HFI1_VERBS_H */