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>

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index c2f2f54dbd49944b3fc73409740118a7f1b36e46..694e39e4f1ffd83f56f47ef52071aa27685f7329 100644 (file)
--- 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);

diff --git a/net/rds/ib.h b/net/rds/ib.h
index 45ac8e8e58f412267e134bb5ae1fab2b59809c09..d21ca88ab628b490c04e3b6ee56bcb65e7204fc0 100644 (file)
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -134,7 +134,7 @@ struct rds_ib_connection {
        struct rds_ib_work_ring i_send_ring;
        struct rm_data_op       *i_data_op;
        struct rds_header       *i_send_hdrs;
-       u64                     i_send_hdrs_dma;
+       dma_addr_t              i_send_hdrs_dma;
        struct rds_ib_send_work *i_sends;
        atomic_t                i_signaled_sends;
 
@@ -144,7 +144,7 @@ struct rds_ib_connection {
        struct rds_ib_incoming  *i_ibinc;
        u32                     i_recv_data_rem;
        struct rds_header       *i_recv_hdrs;
-       u64                     i_recv_hdrs_dma;
+       dma_addr_t              i_recv_hdrs_dma;
        struct rds_ib_recv_work *i_recvs;
        u64                     i_ack_recv;     /* last ACK received */
        struct rds_ib_refill_cache i_cache_incs;
@@ -161,7 +161,7 @@ struct rds_ib_connection {
        struct rds_header       *i_ack;
        struct ib_send_wr       i_ack_wr;
        struct ib_sge           i_ack_sge;
-       u64                     i_ack_dma;
+       dma_addr_t              i_ack_dma;
        unsigned long           i_ack_queued;
 
        /* Flow control related information