Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f326674a authored by Ira Weiny's avatar Ira Weiny Committed by Doug Ledford
Browse files

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: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 583be13c

drivers/staging/rdma/hfi1/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/rdma/hfi1/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/staging/rdma/hfi1/verbs.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */