diff options
| author | Ira Weiny | 2016-01-19 23:41:44 +0100 |
|---|---|---|
| committer | Doug Ledford | 2016-03-11 02:37:35 +0100 |
| commit | f326674ae374e08b34d8b02b2357bad4ef07317c (patch) | |
| tree | b93455f435b716aab09deb716cbbf7b053921661 /drivers/staging/rdma/hfi1 | |
| parent | staging/rdma/hfi1: Add basic rdmavt capability flags for hfi1 (diff) | |
| download | kernel-qcow2-linux-f326674ae374e08b34d8b02b2357bad4ef07317c.tar.gz kernel-qcow2-linux-f326674ae374e08b34d8b02b2357bad4ef07317c.tar.xz kernel-qcow2-linux-f326674ae374e08b34d8b02b2357bad4ef07317c.zip | |
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 <ira.weiny@intel.com>
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/staging/rdma/hfi1')
| -rw-r--r-- | drivers/staging/rdma/hfi1/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/rdma/hfi1/verbs.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rdma/hfi1/verbs.h | 2 |
3 files changed, 2 insertions, 4 deletions
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 */ |