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

Commit ea58a595 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Roland Dreier
Browse files

IB/core: Remove overload in ib_sg_dma* 



The code is replaced by driver specific changes and avoids the pointer
NULL test for drivers that don't overload these operations.

Suggested-by: default avatar&lt;Bart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Tested-by: default avatarVinod Kumar <vinod.kumar@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent f3585a6a

include/rdma/ib_verbs.h

+6 −8
Original line number Diff line number Diff line
@@ -1266,10 +1266,6 @@ struct ib_dma_mapping_ops { 
	void		(*unmap_sg)(struct ib_device *dev,

				    struct scatterlist *sg, int nents,

				    enum dma_data_direction direction);

	u64		(*dma_address)(struct ib_device *dev,

				       struct scatterlist *sg);

	unsigned int	(*dma_len)(struct ib_device *dev,

				   struct scatterlist *sg);

	void		(*sync_single_for_cpu)(struct ib_device *dev,

					       u64 dma_handle,

					       size_t size,
@@ -2089,12 +2085,13 @@ static inline void ib_dma_unmap_sg_attrs(struct ib_device *dev, 
 * ib_sg_dma_address - Return the DMA address from a scatter/gather entry

 * @dev: The device for which the DMA addresses were created

 * @sg: The scatter/gather entry

 *

 * Note: this function is obsolete. To do: change all occurrences of

 * ib_sg_dma_address() into sg_dma_address().

 */

static inline u64 ib_sg_dma_address(struct ib_device *dev,

				    struct scatterlist *sg)

{

	if (dev->dma_ops)

		return dev->dma_ops->dma_address(dev, sg);

	return sg_dma_address(sg);

}
@@ -2102,12 +2099,13 @@ static inline u64 ib_sg_dma_address(struct ib_device *dev, 
 * ib_sg_dma_len - Return the DMA length from a scatter/gather entry

 * @dev: The device for which the DMA addresses were created

 * @sg: The scatter/gather entry

 *

 * Note: this function is obsolete. To do: change all occurrences of

 * ib_sg_dma_len() into sg_dma_len().

 */

static inline unsigned int ib_sg_dma_len(struct ib_device *dev,

					 struct scatterlist *sg)

{

	if (dev->dma_ops)

		return dev->dma_ops->dma_len(dev, sg);

	return sg_dma_len(sg);

}