summaryrefslogtreecommitdiffstats
path: root/include/rdma
diff options
context:
space:
mode:
authorBart Van Assche <bart.vanassche@sandisk.com>2017-01-20 13:04:10 -0800
committerDoug Ledford <dledford@redhat.com>2017-01-24 12:23:35 -0500
commitd43dbacfc06349309a99e50c575d86bc36ca4178 (patch)
treea238000ae26b6a3a054587307421795863635ce7 /include/rdma
parent69324c2015e9ba852f1d66a8150d1a871cc62922 (diff)
downloadlinux-d43dbacfc06349309a99e50c575d86bc36ca4178.tar.bz2
IB/core: Change the type of an ib_dma_alloc_coherent() argument
Change the type of the dma_handle argument from u64 * to dma_addr_t *. This patch does not change any functionality. Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'include/rdma')
-rw-r--r--include/rdma/ib_verbs.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index c2f2f54dbd49..694e39e4f1ff 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -3172,19 +3172,18 @@ static inline void ib_dma_sync_single_for_device(struct ib_device *dev,
*/
static inline void *ib_dma_alloc_coherent(struct ib_device *dev,
size_t size,
- u64 *dma_handle,
+ dma_addr_t *dma_handle,
gfp_t flag)
{
- if (dev->dma_ops)
- return dev->dma_ops->alloc_coherent(dev, size, dma_handle, flag);
- else {
- dma_addr_t handle;
+ if (dev->dma_ops) {
+ u64 handle;
void *ret;
- ret = dma_alloc_coherent(dev->dma_device, size, &handle, flag);
+ ret = dev->dma_ops->alloc_coherent(dev, size, &handle, flag);
*dma_handle = handle;
return ret;
}
+ return dma_alloc_coherent(dev->dma_device, size, dma_handle, flag);
}
/**
@@ -3196,7 +3195,7 @@ static inline void *ib_dma_alloc_coherent(struct ib_device *dev,
*/
static inline void ib_dma_free_coherent(struct ib_device *dev,
size_t size, void *cpu_addr,
- u64 dma_handle)
+ dma_addr_t dma_handle)
{
if (dev->dma_ops)
dev->dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);