ibal: remove unneeded typedefs

al_qp.h defines typedefs that are only used later in the same file.  Remove the typedefs and just define the functions inline.  This also prevents a duplicate typedef (with different types).

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1857 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/core/al/al_qp.h b/core/al/al_qp.h
index bb6d8ad..b884784 100644 (file)
--- a/core/al/al_qp.h
+++ b/core/al/al_qp.h
@@ -49,58 +49,6 @@
 #endif /* CL_KERNEL */\r
 \r
 \r
-typedef ib_api_status_t\r
-(*ib_pfn_modify_qp_t)(\r
-       IN              const   ib_qp_handle_t                          h_qp,\r
-       IN              const   ib_qp_mod_t* const                      p_qp_mod,\r
-       IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
-\r
-typedef ib_api_status_t\r
-(*ib_pfn_post_send_t)(\r
-       IN              const   ib_qp_handle_t                          h_qp,\r
-       IN                              ib_send_wr_t* const                     p_send_wr,\r
-       IN                              ib_send_wr_t                            **pp_send_failure OPTIONAL );\r
-\r
-typedef ib_api_status_t\r
-(*ib_pfn_post_recv_t)(\r
-       IN              const   ib_qp_handle_t                          h_qp,\r
-       IN                              ib_recv_wr_t* const                     p_recv_wr,\r
-       IN                              ib_recv_wr_t                            **p_recv_failure OPTIONAL );\r
-\r
-typedef ib_api_status_t\r
-(*ib_pfn_init_dgrm_svc_t)(\r
-       IN              const   ib_qp_handle_t                          h_qp,\r
-       IN              const   ib_dgrm_info_t* const           p_dgrm_info );\r
-\r
-typedef ib_api_status_t\r
-(*ib_pfn_reg_mad_svc_t)(\r
-       IN              const   ib_qp_handle_t                          h_qp,\r
-       IN              const   ib_mad_svc_t* const                     p_mad_svc,\r
-               OUT                     ib_mad_svc_handle_t* const      ph_mad_svc );\r
-\r
-typedef ib_api_status_t\r
-(*ib_pfn_dereg_mad_svc_t)(\r
-       IN              const   ib_mad_svc_handle_t                     h_mad_svc );\r
-\r
-typedef void\r
-(*ib_pfn_queue_mad_t)(\r
-       IN              const   ib_qp_handle_t                          h_qp,\r
-       IN                              al_mad_wr_t* const                      p_mad_wr );\r
-\r
-typedef void\r
-(*ib_pfn_resume_mad_t)(\r
-       IN              const   ib_qp_handle_t                          h_qp );\r
-\r
-typedef ib_api_status_t\r
-(*ib_pfn_join_mcast_t)(\r
-       IN              const   ib_qp_handle_t                          h_qp,\r
-       IN              const   ib_mcast_req_t* const           p_mcast_req );\r
-\r
-typedef ib_api_status_t\r
-(*ib_pfn_leave_mcast_t)(\r
-       IN              const   ib_mcast_handle_t                       h_mcast );\r
-\r
-\r
 /*\r
  * Queue pair information required by the access layer.  This structure\r
  * is referenced by a user's QP handle.\r
@@ -132,7 +80,11 @@ typedef struct _ib_qp
         * handle.\r
         */\r
        ib_qp_handle_t                          h_ud_send_qp;\r
-       ib_pfn_post_send_t                      pfn_ud_post_send;\r
+       ib_api_status_t\r
+       (*pfn_ud_post_send)(\r
+               IN              const   ib_qp_handle_t                          h_qp,\r
+               IN                              ib_send_wr_t* const                     p_send_wr,\r
+               IN                              ib_send_wr_t                            **pp_send_failure OPTIONAL );\r
 \r
        ib_cq_handle_t                          h_recv_cq;\r
        ib_cq_handle_t                          h_send_cq;\r
@@ -144,15 +96,44 @@ typedef struct _ib_qp
 \r
        ib_pfn_event_cb_t                       pfn_event_cb;\r
 \r
-       ib_pfn_modify_qp_t                      pfn_modify_qp;\r
-       ib_pfn_post_recv_t                      pfn_post_recv;\r
-       ib_pfn_post_send_t                      pfn_post_send;\r
-       ib_pfn_reg_mad_svc_t            pfn_reg_mad_svc;\r
-       ib_pfn_dereg_mad_svc_t          pfn_dereg_mad_svc;\r
-       ib_pfn_queue_mad_t                      pfn_queue_mad;\r
-       ib_pfn_resume_mad_t                     pfn_resume_mad;\r
-       ib_pfn_init_dgrm_svc_t          pfn_init_dgrm_svc;\r
-       ib_pfn_join_mcast_t                     pfn_join_mcast;\r
+       ib_api_status_t\r
+       (*pfn_modify_qp)(\r
+               IN              const   ib_qp_handle_t                          h_qp,\r
+               IN              const   ib_qp_mod_t* const                      p_qp_mod,\r
+               IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
+       ib_api_status_t\r
+       (*pfn_post_recv)(\r
+               IN              const   ib_qp_handle_t                          h_qp,\r
+               IN                              ib_recv_wr_t* const                     p_recv_wr,\r
+               IN                              ib_recv_wr_t                            **p_recv_failure OPTIONAL );\r
+       ib_api_status_t\r
+       (*pfn_post_send)(\r
+               IN              const   ib_qp_handle_t                          h_qp,\r
+               IN                              ib_send_wr_t* const                     p_send_wr,\r
+               IN                              ib_send_wr_t                            **pp_send_failure OPTIONAL );\r
+       ib_api_status_t\r
+       (*pfn_reg_mad_svc)(\r
+               IN              const   ib_qp_handle_t                          h_qp,\r
+               IN              const   ib_mad_svc_t* const                     p_mad_svc,\r
+                       OUT                     ib_mad_svc_handle_t* const      ph_mad_svc );\r
+       ib_api_status_t\r
+       (*pfn_dereg_mad_svc)(\r
+               IN              const   ib_mad_svc_handle_t                     h_mad_svc );\r
+       void\r
+       (*pfn_queue_mad)(\r
+               IN              const   ib_qp_handle_t                          h_qp,\r
+               IN                              al_mad_wr_t* const                      p_mad_wr );\r
+       void\r
+       (*pfn_resume_mad)(\r
+               IN              const   ib_qp_handle_t                          h_qp );\r
+       ib_api_status_t\r
+       (*pfn_init_dgrm_svc)(\r
+               IN              const   ib_qp_handle_t                          h_qp,\r
+               IN              const   ib_dgrm_info_t* const           p_dgrm_info );\r
+       ib_api_status_t\r
+       (*pfn_join_mcast)(\r
+               IN              const   ib_qp_handle_t                          h_qp,\r
+               IN              const   ib_mcast_req_t* const           p_mcast_req );\r
 \r
 #ifdef CL_KERNEL\r
        ndi_qp_csq_t                            *p_irp_queue;\r