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

Commit eb636ac0 authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Doug Ledford
Browse files

IB/qib: Remove dma.c and use rdmavt version of dma functions 



This patch removes the qib_dma.c file and uses the version which has been
added to 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 2dc05ab5

drivers/infiniband/hw/qib/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_INFINIBAND_QIB) += ib_qib.o



ib_qib-y := qib_cq.o qib_diag.o qib_dma.o qib_driver.o qib_eeprom.o \

ib_qib-y := qib_cq.o qib_diag.o qib_driver.o qib_eeprom.o \

	qib_file_ops.o qib_fs.o qib_init.o qib_intr.o qib_keys.o \

	qib_mad.o qib_mmap.o qib_mr.o qib_pcie.o qib_pio_copy.o \

	qib_qp.o qib_qsfp.o qib_rc.o qib_ruc.o qib_sdma.o qib_srq.o \

drivers/infiniband/hw/qib/qib_verbs.c

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <linux/mm.h>

#include <linux/random.h>

#include <linux/vmalloc.h>

#include <rdma/rdma_vt.h>



#include "qib.h"

#include "qib_common.h"
@@ -2273,7 +2274,7 @@ int qib_register_ib_device(struct qib_devdata *dd) 
	ibdev->detach_mcast = qib_multicast_detach;

	ibdev->process_mad = qib_process_mad;

	ibdev->mmap = qib_mmap;

	ibdev->dma_ops = &qib_dma_mapping_ops;

	ibdev->dma_ops = NULL;

	ibdev->get_port_immutable = qib_port_immutable;



	snprintf(ibdev->node_desc, sizeof(ibdev->node_desc),

drivers/infiniband/hw/qib/qib_verbs.h

+0 −2
Original line number Diff line number Diff line
@@ -1182,6 +1182,4 @@ extern unsigned int ib_qib_max_srq_wrs; 


extern const u32 ib_qib_rnr_table[];



extern struct ib_dma_mapping_ops qib_dma_mapping_ops;



#endif                          /* QIB_VERBS_H */