p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: <Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Tested-by: Vinod Kumar <vinod.kumar@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
This commit is contained in:
Mike Marciniszyn 2014-03-28 13:26:59 -04:00 committed by Roland Dreier
parent f3585a6ae3
commit ea58a59565
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/rdma/ib_verbs.h
View File

@ -1266,10 +1266,6 @@ struct ib_dma_mapping_ops {
void (*unmap_sg)(struct ib_device *dev, void (*unmap_sg)(struct ib_device *dev,
struct scatterlist *sg, int nents, struct scatterlist *sg, int nents,
enum dma_data_direction direction); 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, void (*sync_single_for_cpu)(struct ib_device *dev,
u64 dma_handle, u64 dma_handle,
size_t size, 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 * ib_sg_dma_address - Return the DMA address from a scatter/gather entry
* @dev: The device for which the DMA addresses were created * @dev: The device for which the DMA addresses were created
* @sg: The scatter/gather entry * @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, static inline u64 ib_sg_dma_address(struct ib_device *dev,
struct scatterlist *sg) struct scatterlist *sg)
{ {
if (dev->dma_ops)
return dev->dma_ops->dma_address(dev, sg);
return sg_dma_address(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 * ib_sg_dma_len - Return the DMA length from a scatter/gather entry
* @dev: The device for which the DMA addresses were created * @dev: The device for which the DMA addresses were created
* @sg: The scatter/gather entry * @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, static inline unsigned int ib_sg_dma_len(struct ib_device *dev,
struct scatterlist *sg) struct scatterlist *sg)
{ {
if (dev->dma_ops)
return dev->dma_ops->dma_len(dev, sg);
return sg_dma_len(sg); return sg_dma_len(sg);
} }