dapl: remove null macros
authorshefty <shefty@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Fri, 9 May 2008 14:03:43 +0000 (14:03 +0000)
committershefty <shefty@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Fri, 9 May 2008 14:03:43 +0000 (14:03 +0000)
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1148 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

ulp/dapl/dapl/common/dapl_adapter_util.h
ulp/dapl/dapl/common/dapl_evd_dto_callb.c
ulp/dapl/dapl/common/dapl_evd_util.c
ulp/dapl/dapl/common/dapl_evd_util.h
ulp/dapl/dapl/ibal/dapl_ibal_cm.c
ulp/dapl/dapl/ibal/dapl_ibal_dto.h
ulp/dapl/dapl/ibal/dapl_ibal_mrdb.c
ulp/dapl/dapl/ibal/dapl_ibal_qp.c
ulp/dapl/dapl/ibal/dapl_ibal_util.c

index 510adf7..21cd839 100644 (file)
@@ -192,23 +192,23 @@ DAT_RETURN dapls_ib_query_hca (
 \r
 DAT_RETURN dapls_ib_completion_poll (\r
        IN  ib_hca_handle_t             hca_handle,\r
-       IN  ib_cq_handle_t FUNC_PTR64           cq_handle,\r
+       IN  ib_cq_handle_t              cq_handle,\r
        IN  ib_work_completion_t        *cqe_ptr);\r
 \r
 DAT_RETURN dapls_ib_completion_notify (\r
        IN  ib_hca_handle_t             hca_handle,\r
-       IN  ib_cq_handle_t FUNC_PTR64           cq_handle,\r
+       IN  ib_cq_handle_t              cq_handle,\r
        IN  ib_notification_type_t      type);\r
 \r
 DAT_RETURN\r
 dapls_ib_n_completions_notify (\r
        IN ib_hca_handle_t              hca_handle,\r
-       IN ib_cq_handle_t FUNC_PTR64            cq_handle,\r
+       IN ib_cq_handle_t               cq_handle,\r
        IN uint32_t                     n_cqes);\r
 \r
 DAT_RETURN\r
 dapls_ib_peek_cq (\r
-       IN  ib_cq_handle_t FUNC_PTR64           cq_handle,\r
+       IN  ib_cq_handle_t              cq_handle,\r
        OUT uint32_t*                   p_n_cqes);\r
 \r
 DAT_RETURN\r
index 86a377f..76a38a1 100644 (file)
@@ -71,7 +71,7 @@
 void \r
 dapl_evd_dto_callback (\r
     IN ib_hca_handle_t         hca_handle, \r
-    IN ib_cq_handle_t FUNC_PTR64       cq_handle, \r
+    IN ib_cq_handle_t  cq_handle, \r
     IN void*           user_context)\r
 {\r
     DAPL_EVD           *evd_ptr;\r
index e0d9cc0..a5cf340 100644 (file)
@@ -1184,7 +1184,7 @@ dapls_evd_copy_cq (
 {\r
     ib_work_completion_t       cur_cqe;\r
     DAT_RETURN                 dat_status;\r
-    ib_cq_handle_t VOID_PTR64          cq_handle;\r
+    ib_cq_handle_t             cq_handle;\r
     ib_hca_handle_t            hca_handle;\r
     DAPL_EP                    *ep_ptr;\r
     DAT_EVENT                  *event;\r
@@ -1291,7 +1291,7 @@ dapls_evd_cq_poll_to_event (
     OUT DAT_EVENT      *event)\r
 {\r
     DAT_RETURN                 dat_status;\r
-    ib_cq_handle_t VOID_PTR64          cq_handle;\r
+    ib_cq_handle_t             cq_handle;\r
     ib_hca_handle_t            hca_handle;\r
     ib_work_completion_t       cur_cqe;\r
     DAPL_EP                    *ep_ptr;\r
index 4818f17..7fe76c9 100644 (file)
@@ -121,7 +121,7 @@ extern void dapl_evd_connection_callback (
 /* dto verb callback */\r
 extern void dapl_evd_dto_callback (\r
     IN  ib_hca_handle_t        ib_hca_handle, \r
-    IN  ib_cq_handle_t FUNC_PTR64              ib_cq_handle, \r
+    IN  ib_cq_handle_t                 ib_cq_handle, \r
     IN  void*                  context);\r
 \r
 /* async verb callbacks */\r
index 4d74531..38cfe0d 100644 (file)
@@ -53,7 +53,7 @@ dapli_ib_reg_svc_cb (
 {\r
     DAPL_HCA *hca_ptr;\r
 \r
-    hca_ptr = (DAPL_HCA * VOID_PTR64) p_reg_svc_rec->svc_context;\r
+    hca_ptr = (DAPL_HCA *) p_reg_svc_rec->svc_context;\r
 \r
     dapl_os_assert (hca_ptr);\r
 \r
@@ -475,7 +475,7 @@ dapli_ib_sa_query_cb (
             p_path_rec = ib_get_query_path_rec (p_query_rec->p_result_mad, 0);\r
             if (p_path_rec) \r
             {\r
-                dapl_os_memcpy ((void * VOID_PTR64) p_query_rec->query_context, \r
+                dapl_os_memcpy ((void *) p_query_rec->query_context, \r
                                 (void *) p_path_rec,\r
                                 sizeof (ib_path_rec_t));\r
                 dapl_dbg_log ( DAPL_DBG_TYPE_CM | DAPL_DBG_TYPE_CALLBACK,\r
@@ -499,7 +499,7 @@ dapli_ib_sa_query_cb (
             p_svc_rec = ib_get_query_svc_rec (p_query_rec->p_result_mad, 0);\r
             if (p_svc_rec) \r
             {\r
-                dapl_os_memcpy ((void * VOID_PTR64) p_query_rec->query_context, \r
+                dapl_os_memcpy ((void *) p_query_rec->query_context, \r
                                 (void *) p_svc_rec,\r
                                 sizeof (ib_service_record_t));\r
                 dapl_dbg_log (\r
@@ -522,7 +522,7 @@ dapli_ib_sa_query_cb (
         {\r
             ib_user_query_t    *p_user_query;\r
 \r
-            p_user_query =(ib_user_query_t * VOID_PTR64)p_query_rec->query_context;\r
+            p_user_query =(ib_user_query_t *)p_query_rec->query_context;\r
             if (p_user_query)\r
             {\r
                 switch (p_user_query->attr_id)\r
@@ -627,7 +627,7 @@ dapli_ib_cm_dreq_cb (
     \r
        dapl_os_assert (p_cm_dreq_rec);\r
 \r
-    ep_ptr  = (DAPL_EP * VOID_PTR64) p_cm_dreq_rec->qp_context;\r
+    ep_ptr  = (DAPL_EP *) p_cm_dreq_rec->qp_context;\r
 \r
     if ( ep_ptr == NULL ||\r
          ep_ptr->header.magic == DAPL_MAGIC_INVALID )\r
@@ -675,7 +675,7 @@ dapli_ib_cm_dreq_cb (
 \r
         dapls_cr_callback ( p_cm_dreq_rec->h_cm_dreq,\r
                             IB_CME_DISCONNECTED,\r
-                            (void * VOID_PTR64) p_cm_dreq_rec->p_dreq_pdata,\r
+                            (void *) p_cm_dreq_rec->p_dreq_pdata,\r
                             (void *) sp_ptr,\r
                             NULL);\r
     }\r
@@ -685,7 +685,7 @@ dapli_ib_cm_dreq_cb (
 \r
         dapl_evd_connection_callback ( p_cm_dreq_rec->h_cm_dreq,\r
                                        IB_CME_DISCONNECTED,\r
-                                       (void * VOID_PTR64) p_cm_dreq_rec->p_dreq_pdata,\r
+                                       (void *) p_cm_dreq_rec->p_dreq_pdata,\r
                                        p_cm_dreq_rec->qp_context);\r
     }\r
 }\r
@@ -699,7 +699,7 @@ dapli_ib_cm_drep_cb (
     \r
     dapl_os_assert (p_cm_drep_rec != NULL);\r
 \r
-    ep_ptr  = (DAPL_EP * VOID_PTR64) p_cm_drep_rec->qp_context;\r
+    ep_ptr  = (DAPL_EP *) p_cm_drep_rec->qp_context;\r
 \r
        if (ep_ptr)\r
        {\r
@@ -722,7 +722,7 @@ dapli_ib_cm_drep_cb (
 \r
                        dapls_cr_callback ( ep_ptr->cm_handle,\r
                             IB_CME_DISCONNECTED,\r
-                            (void * VOID_PTR64) p_cm_drep_rec->p_drep_pdata,\r
+                            (void *) p_cm_drep_rec->p_drep_pdata,\r
                             (void *) sp_ptr,\r
                             NULL);\r
                }\r
@@ -732,7 +732,7 @@ dapli_ib_cm_drep_cb (
 \r
                        dapl_evd_connection_callback ( ep_ptr->cm_handle,\r
                                        IB_CME_DISCONNECTED,\r
-                                       (void * VOID_PTR64) p_cm_drep_rec->p_drep_pdata,\r
+                                       (void *) p_cm_drep_rec->p_drep_pdata,\r
                                        p_cm_drep_rec->qp_context);\r
                }\r
        }\r
@@ -754,10 +754,10 @@ dapli_ib_cm_rep_cb (
 \r
     dapl_os_memzero (&cm_rtu, sizeof ( ib_cm_rtu_t ));\r
 \r
-    dapl_os_assert ( ((DAPL_HEADER * VOID_PTR64) p_cm_rep_rec->qp_context)->magic == \r
+    dapl_os_assert ( ((DAPL_HEADER *) p_cm_rep_rec->qp_context)->magic == \r
                      DAPL_MAGIC_EP );\r
                          \r
-    ep_ptr  = (DAPL_EP * VOID_PTR64) p_cm_rep_rec->qp_context;\r
+    ep_ptr  = (DAPL_EP *) p_cm_rep_rec->qp_context;\r
     dapl_dbg_log (DAPL_DBG_TYPE_CM, \r
                   "--> DiCRpcb: EP = %p local_max_rdma_read_in %d\n", \r
                   ep_ptr, p_cm_rep_rec->resp_res);\r
@@ -789,7 +789,7 @@ dapli_ib_cm_rep_cb (
         cm_cb_op = IB_CME_LOCAL_FAILURE;\r
     }\r
 \r
-    prd_ptr = (DAPL_PRIVATE * VOID_PTR64) p_cm_rep_rec->p_rep_pdata;\r
+    prd_ptr = (DAPL_PRIVATE *) p_cm_rep_rec->p_rep_pdata;\r
 \r
 #ifdef DAPL_DBG\r
 #if 0\r
@@ -814,7 +814,7 @@ dapli_ib_cm_rep_cb (
                             p_cm_rep_rec->h_cm_rep,\r
                             cm_cb_op,\r
                             (void *) prd_ptr,\r
-                            (void * VOID_PTR64) p_cm_rep_rec->qp_context);\r
+                            (void *) p_cm_rep_rec->qp_context);\r
 }\r
 \r
 \r
@@ -827,7 +827,7 @@ dapli_ib_cm_rej_cb (
 \r
     dapl_os_assert (p_cm_rej_rec);\r
 \r
-    ep_ptr = (DAPL_EP * VOID_PTR64) p_cm_rej_rec->qp_context;\r
+    ep_ptr = (DAPL_EP *) p_cm_rej_rec->qp_context;\r
 \r
     dapl_dbg_log (DAPL_DBG_TYPE_CM, \r
                   "--> DiCRjcb: EP = %p QP = %p rej reason = 0x%x\n", \r
@@ -888,7 +888,7 @@ dapli_ib_cm_rej_cb (
     {\r
         dapls_cr_callback ( ep_ptr->cm_handle,\r
                             cm_event,\r
-                            (void * VOID_PTR64) p_cm_rej_rec->p_rej_pdata,\r
+                            (void *) p_cm_rej_rec->p_rej_pdata,\r
                             (void *) ((DAPL_CR *) ep_ptr->cr_ptr)->sp_ptr,\r
                             NULL);\r
     }\r
@@ -896,8 +896,8 @@ dapli_ib_cm_rej_cb (
     {\r
         dapl_evd_connection_callback ( ep_ptr->cm_handle,\r
                                        cm_event,\r
-                                       (void * VOID_PTR64) p_cm_rej_rec->p_rej_pdata,\r
-                                       (void * VOID_PTR64) p_cm_rej_rec->qp_context);\r
+                                       (void *) p_cm_rej_rec->p_rej_pdata,\r
+                                       (void *) p_cm_rej_rec->qp_context);\r
     }\r
 \r
 }\r
@@ -912,7 +912,7 @@ dapli_ib_cm_req_cb (
 \r
     dapl_os_assert (p_cm_req_rec);\r
 \r
-    sp_ptr = (DAPL_SP * VOID_PTR64) p_cm_req_rec->context;\r
+    sp_ptr = (DAPL_SP *) p_cm_req_rec->context;\r
 \r
     dapl_os_assert (sp_ptr);\r
 \r
@@ -993,8 +993,8 @@ dapli_ib_cm_req_cb (
 \r
     dapls_cr_callback ( p_cm_req_rec->h_cm_req,\r
                         IB_CME_CONNECTION_REQUEST_PENDING,\r
-                        (void * VOID_PTR64) p_cm_req_rec->p_req_pdata,\r
-                        (void * VOID_PTR64) p_cm_req_rec->context,\r
+                        (void *) p_cm_req_rec->p_req_pdata,\r
+                        (void *) p_cm_req_rec->context,\r
                         (DAT_IA_ADDRESS_PTR)&dest_ia_addr);\r
 }\r
 \r
@@ -1016,7 +1016,7 @@ dapli_ib_cm_rtu_cb (
 \r
     dapl_os_assert (p_cm_rtu_rec != NULL);\r
    \r
-    ep_ptr = (DAPL_EP * VOID_PTR64) p_cm_rtu_rec->qp_context;\r
+    ep_ptr = (DAPL_EP *) p_cm_rtu_rec->qp_context;\r
 \r
     dapl_dbg_log (DAPL_DBG_TYPE_CM | DAPL_DBG_TYPE_CALLBACK, \r
                   "--> DiCRucb: EP = %p QP = %p\n", ep_ptr, ep_ptr->qp_handle); \r
@@ -1029,7 +1029,7 @@ dapli_ib_cm_rtu_cb (
 \r
         dapls_cr_callback ( ep_ptr->cm_handle,\r
                             IB_CME_CONNECTED,\r
-                            (void * VOID_PTR64) p_cm_rtu_rec->p_rtu_pdata,\r
+                            (void *) p_cm_rtu_rec->p_rtu_pdata,\r
                             (void *) sp_ptr,\r
                             NULL);\r
                             \r
@@ -1039,7 +1039,7 @@ dapli_ib_cm_rtu_cb (
         dapl_evd_connection_callback ( \r
                             ep_ptr->cm_handle,\r
                             IB_CME_CONNECTED,\r
-                            (void * VOID_PTR64) p_cm_rtu_rec->p_rtu_pdata,\r
+                            (void *) p_cm_rtu_rec->p_rtu_pdata,\r
                             (void *) ep_ptr);\r
     }\r
 }\r
index 5b7bd9b..7decf91 100644 (file)
@@ -30,7 +30,7 @@ dapls_cqe_opcode_convert (ib_work_completion_t *cqe_p);
 \r
 extern DAT_RETURN\r
 dapls_ib_cq_late_alloc (\r
-       IN  ib_pd_handle_t FUNC_PTR64      pd_handle,\r
+       IN  ib_pd_handle_t       pd_handle,\r
        IN  DAPL_EVD            *evd_ptr);\r
 \r
 #define                DAPL_DEFAULT_DS_ENTRIES         8\r
index b027049..c5254a2 100644 (file)
@@ -213,7 +213,7 @@ DAT_RETURN dapls_mrdb_record_dec (
 DAT_RETURN dapls_mrdb_record_update (\r
        IN  DAPL_HCA                    *hca_ptr,\r
        IN  DAT_LMR_COOKIE              shared_mem_id,\r
-       IN  struct _ib_mr* FUNC_PTR64           mr_handle)\r
+       IN  struct _ib_mr*              mr_handle)\r
 {\r
     cl_status_t                  cl_status;\r
     mrdb_rec_update_ioctl_t      ioctl_buf;\r
@@ -274,7 +274,7 @@ DAT_RETURN dapls_mrdb_record_query (
        IN  DAPL_HCA                    *hca_ptr,\r
        IN  DAT_LMR_COOKIE              shared_mem_id,\r
        OUT int                         *p_ib_shmid,\r
-       OUT struct _ib_mr* FUNC_PTR64           *p_mr_handle)\r
+       OUT struct _ib_mr*              *p_mr_handle)\r
 {\r
     cl_status_t               cl_status;\r
     mrdb_rec_query_ioctl_t    ioctl_buf;\r
index 90db767..8fecdd2 100644 (file)
@@ -118,9 +118,9 @@ dapls_ib_qp_alloc (
     DAT_RETURN            dat_status;\r
     ib_api_status_t       ib_status;\r
     ib_qp_create_t        qp_create;\r
-    ib_pd_handle_t VOID_PTR64        ib_pd_handle;\r
-    ib_cq_handle_t VOID_PTR64        cq_recv;\r
-    ib_cq_handle_t VOID_PTR64        cq_send;\r
+    ib_pd_handle_t        ib_pd_handle;\r
+    ib_cq_handle_t               cq_recv;\r
+    ib_cq_handle_t        cq_send;\r
     dapl_ibal_ca_t        *p_ca;\r
     dapl_ibal_port_t      *p_active_port;\r
     ib_qp_attr_t           qp_attr;\r
@@ -138,7 +138,7 @@ dapls_ib_qp_alloc (
 \r
     dapl_os_assert ( recv_evd_ptr != DAT_HANDLE_NULL );\r
     {\r
-        cq_recv = (ib_cq_handle_t VOID_PTR64) recv_evd_ptr->ib_cq_handle;\r
+        cq_recv = (ib_cq_handle_t) recv_evd_ptr->ib_cq_handle;\r
         \r
         if ((cq_recv == IB_INVALID_HANDLE) && \r
             ( 0 != (recv_evd_ptr->evd_flags & ~DAT_EVD_SOFTWARE_FLAG) ))\r
@@ -160,7 +160,7 @@ dapls_ib_qp_alloc (
                 return (dat_status);\r
             }\r
         \r
-            cq_recv = (ib_cq_handle_t VOID_PTR64) recv_evd_ptr->ib_cq_handle;\r
+            cq_recv = (ib_cq_handle_t) recv_evd_ptr->ib_cq_handle;\r
             dapl_dbg_log (DAPL_DBG_TYPE_EP, \r
                                "--> DsQA: alloc_recv_CQ = %p\n", cq_recv); \r
         \r
@@ -169,7 +169,7 @@ dapls_ib_qp_alloc (
 \r
     dapl_os_assert ( request_evd_ptr != DAT_HANDLE_NULL );\r
     {\r
-        cq_send = (ib_cq_handle_t VOID_PTR64) request_evd_ptr->ib_cq_handle;\r
+        cq_send = (ib_cq_handle_t) request_evd_ptr->ib_cq_handle;\r
         \r
         if ((cq_send == IB_INVALID_HANDLE) && \r
             ( 0 != (request_evd_ptr->evd_flags & ~DAT_EVD_SOFTWARE_FLAG) ))\r
@@ -191,7 +191,7 @@ dapls_ib_qp_alloc (
                 return (dat_status);\r
             }\r
 \r
-            cq_send = (ib_cq_handle_t VOID_PTR64) request_evd_ptr->ib_cq_handle;\r
+            cq_send = (ib_cq_handle_t) request_evd_ptr->ib_cq_handle;\r
             dapl_dbg_log (DAPL_DBG_TYPE_EP, \r
                                "--> DsQA: alloc_send_CQ = %p\n", cq_send); \r
         }\r
@@ -292,7 +292,7 @@ dapls_ib_qp_free (
         IN  DAPL_EP                *ep_ptr )\r
 {\r
 \r
-       ib_qp_handle_t VOID_PTR64               qp_handle;\r
+       ib_qp_handle_t          qp_handle;\r
        UNREFERENCED_PARAMETER(ia_ptr);\r
 \r
        dapl_dbg_log (DAPL_DBG_TYPE_EP, \r
@@ -345,7 +345,7 @@ dapls_ib_qp_modify (
 {\r
     ib_qp_attr_t                  qp_attr;\r
     ib_api_status_t               ib_status;\r
-    ib_qp_handle_t VOID_PTR64                qp_handle;\r
+    ib_qp_handle_t                qp_handle;\r
     ib_qp_state_t                 qp_state;\r
     ib_qp_mod_t                   qp_mod;\r
     ib_av_attr_t                  *p_av_attr;\r
@@ -454,7 +454,7 @@ bail:
 \r
 ib_api_status_t \r
 dapls_modify_qp_state_to_error (\r
-        ib_qp_handle_t VOID_PTR64                qp_handle )\r
+        ib_qp_handle_t                qp_handle )\r
 {\r
     ib_qp_mod_t      qp_mod;\r
     ib_api_status_t  ib_status;\r
@@ -474,7 +474,7 @@ dapls_modify_qp_state_to_error (
 \r
 ib_api_status_t \r
 dapls_modify_qp_state_to_reset (\r
-        ib_qp_handle_t VOID_PTR64                qp_handle )\r
+        ib_qp_handle_t                qp_handle )\r
 {\r
     ib_qp_mod_t      qp_mod;\r
     ib_api_status_t  ib_status;\r
@@ -494,7 +494,7 @@ dapls_modify_qp_state_to_reset (
 \r
 ib_api_status_t \r
 dapls_modify_qp_state_to_init (\r
-        IN    ib_qp_handle_t FUNC_PTR64         qp_handle,\r
+        IN    ib_qp_handle_t         qp_handle,\r
                IN    DAT_EP_ATTR            *p_attr,\r
         IN    dapl_ibal_port_t       *p_port )\r
 {\r
@@ -524,7 +524,7 @@ dapls_modify_qp_state_to_init (
 \r
 ib_api_status_t \r
 dapls_modify_qp_state_to_rtr (\r
-        ib_qp_handle_t VOID_PTR64          qp_handle,\r
+        ib_qp_handle_t          qp_handle,\r
         ib_net32_t              dest_qp,\r
         ib_lid_t                dest_lid,\r
         dapl_ibal_port_t        *p_port)\r
@@ -562,7 +562,7 @@ dapls_modify_qp_state_to_rtr (
 \r
 ib_api_status_t \r
 dapls_modify_qp_state_to_rts (\r
-        ib_qp_handle_t VOID_PTR64                qp_handle )\r
+        ib_qp_handle_t                qp_handle )\r
 {\r
     ib_qp_mod_t        qp_mod;\r
     ib_api_status_t    ib_status;\r
index 268fbfc..ea4459e 100644 (file)
@@ -437,7 +437,7 @@ dapli_add_active_port(
 \r
 static dapl_ibal_ca_t *\r
 dapli_alloc_ca(\r
-    IN    ib_al_handle_t FUNC_PTR64  h_al,\r
+    IN    ib_al_handle_t  h_al,\r
     IN    ib_net64_t      ca_guid)\r
 {\r
     dapl_ibal_ca_t         *p_ca;\r
@@ -540,7 +540,7 @@ close_and_free_ca:
 \r
 static dapl_ibal_ca_t *\r
 dapli_add_ca(\r
-    IN ib_al_handle_t FUNC_PTR64    h_al,\r
+    IN ib_al_handle_t    h_al,\r
     IN ib_net64_t        ca_guid)\r
 {\r
     dapl_ibal_ca_t     *p_ca;\r
@@ -907,7 +907,7 @@ DAT_RETURN dapls_ib_close_hca (
  */\r
 static void\r
 dapli_ib_cq_completion_cb (\r
-       IN      const   ib_cq_handle_t FUNC_PTR64               h_cq,\r
+       IN      const   ib_cq_handle_t      h_cq,\r
        IN                      void                            *cq_context )\r
 {\r
     DAPL_EVD           *evd_ptr;\r
@@ -953,7 +953,7 @@ dapli_ib_cq_completion_cb (
  */\r
 DAT_RETURN\r
 dapls_ib_cq_late_alloc (\r
-        IN  ib_pd_handle_t FUNC_PTR64        pd_handle,\r
+        IN  ib_pd_handle_t        pd_handle,\r
         IN  DAPL_EVD              *evd_ptr)\r
 {\r
     ib_cq_create_t  cq_create;\r
@@ -977,7 +977,7 @@ dapls_ib_cq_late_alloc (
     }\r
 \r
     ib_status = ib_create_cq (\r
-                        (ib_ca_handle_t VOID_PTR64)ibal_ca->h_ca,\r
+                        (ib_ca_handle_t)ibal_ca->h_ca,\r
                         &cq_create,\r
                         evd_ptr /* context */,\r
                         dapli_ibal_cq_async_error_callback,\r
@@ -1368,7 +1368,7 @@ dapls_ib_mr_register (
         IN  DAT_MEM_PRIV_FLAGS  privileges)\r
 {\r
     ib_api_status_t     ib_status;\r
-    ib_mr_handle_t VOID_PTR64      mr_handle;\r
+    ib_mr_handle_t      mr_handle;\r
     ib_mr_create_t      mr_create;\r
     uint32_t            l_key, r_key; \r
 \r
@@ -1483,9 +1483,9 @@ dapls_ib_mr_register_shared (
         IN  DAT_MEM_PRIV_FLAGS               privileges)\r
 {\r
     DAT_VADDR                   virt_addr;\r
-    ib_mr_handle_t VOID_PTR64              mr_handle;\r
+    ib_mr_handle_t                             mr_handle;\r
     ib_api_status_t             ib_status;\r
-    ib_mr_handle_t VOID_PTR64              new_mr_handle;\r
+    ib_mr_handle_t                             new_mr_handle;\r
     ib_access_t                 access_ctrl;\r
     uint32_t                    l_key, r_key; \r
     ib_mr_create_t      mr_create;\r
@@ -1501,7 +1501,7 @@ dapls_ib_mr_register_shared (
 \r
     mr_create.vaddr         = (void *) virt_addr;\r
     mr_create.access_ctrl   = access_ctrl;\r
-    mr_handle = (ib_mr_handle_t VOID_PTR64) lmr->mr_handle;\r
+    mr_handle = (ib_mr_handle_t) lmr->mr_handle;\r
 \r
     dapl_dbg_log (DAPL_DBG_TYPE_UTIL, \r
                        "--> DsIMRS: orig mr_handle %p vaddr %p\n", \r
@@ -1575,7 +1575,7 @@ dapls_ib_mw_alloc (
 {\r
     ib_api_status_t     ib_status;\r
     uint32_t            r_key;\r
-    ib_mw_handle_t VOID_PTR64      mw_handle;\r
+    ib_mw_handle_t             mw_handle;\r
 \r
     ib_status = ib_create_mw (\r
                   ((DAPL_PZ *)rmr->param.pz_handle)->pd_handle,\r
@@ -2051,7 +2051,7 @@ DAT_RETURN dapls_ib_query_hca (
 DAT_RETURN\r
 dapls_ib_completion_poll (\r
                 IN ib_hca_handle_t       hca_handle,\r
-                IN ib_cq_handle_t FUNC_PTR64        cq_handle,\r
+                IN ib_cq_handle_t               cq_handle,\r
                 IN ib_work_completion_t* cqe_ptr)\r
 {\r
     ib_api_status_t        ib_status;\r
@@ -2082,7 +2082,7 @@ dapls_ib_completion_poll (
 DAT_RETURN\r
 dapls_ib_completion_notify (\r
                 IN ib_hca_handle_t hca_handle,\r
-                IN ib_cq_handle_t FUNC_PTR64 cq_handle,\r
+                IN ib_cq_handle_t  cq_handle,\r
                 IN ib_notification_type_t type)\r
 {\r
     ib_api_status_t        ib_status;\r
@@ -2103,7 +2103,7 @@ dapls_ib_completion_notify (
 DAT_RETURN\r
 dapls_ib_n_completions_notify (\r
         IN ib_hca_handle_t hca_handle,\r
-        IN ib_cq_handle_t FUNC_PTR64 cq_handle,\r
+        IN ib_cq_handle_t  cq_handle,\r
         IN uint32_t n_cqes)\r
 {\r
     ib_api_status_t        ib_status;\r
@@ -2119,7 +2119,7 @@ dapls_ib_n_completions_notify (
 \r
 DAT_RETURN\r
 dapls_ib_peek_cq (\r
-        IN ib_cq_handle_t FUNC_PTR64 cq_handle,\r
+        IN ib_cq_handle_t cq_handle,\r
         OUT uint32_t* p_n_cqes)\r
 {\r
     ib_api_status_t        ib_status;\r