[openib-general] [PATCH][11/19] kDAPL: Remove typedef DAT_EP_STATE

[Tom Duffy]

Signed-off-by: Tom Duffy <tduffy at sun.com>

diff -Nurp -X /home/tduffy/dontdiff linux-kernel10/dat/dat.h linux-kernel11/dat/dat.h
--- linux-kernel10/dat/dat.h	2005-05-13 14:21:13.415001000 -0700
+++ linux-kernel11/dat/dat.h	2005-05-13 14:32:57.034000000 -0700
@@ -579,7 +579,7 @@ struct dat_ep_attr {
 };
 
 /* Endpoint Parameters */
-typedef enum dat_ep_state {
+enum dat_ep_state  {
 	DAT_EP_STATE_UNCONNECTED,	/* quiescent state */
 	DAT_EP_STATE_UNCONFIGURED_UNCONNECTED,
 	DAT_EP_STATE_RESERVED,
@@ -593,11 +593,11 @@ typedef enum dat_ep_state {
 	DAT_EP_STATE_DISCONNECT_PENDING,
 	DAT_EP_STATE_DISCONNECTED,
 	DAT_EP_STATE_COMPLETION_PENDING
-} DAT_EP_STATE;
+};
 
 struct dat_ep_param {
 	DAT_IA_HANDLE ia_handle;
-	DAT_EP_STATE ep_state;
+	enum dat_ep_state ep_state;
 	struct sockaddr *local_ia_address_ptr;
 	DAT_PORT_QUAL local_port_qual;
 	struct sockaddr *remote_ia_address_ptr;
@@ -1175,7 +1175,7 @@ typedef u32 (*DAT_EP_POST_RDMA_WRITE_FUN
 					   const struct dat_rmr_triplet *,
 					   enum dat_completion_flags);
 
-typedef u32 (*DAT_EP_GET_STATUS_FUNC)(DAT_EP_HANDLE, DAT_EP_STATE *,
+typedef u32 (*DAT_EP_GET_STATUS_FUNC)(DAT_EP_HANDLE, enum dat_ep_state *,
 				      boolean_t *, boolean_t *);
 
 typedef u32 (*DAT_EP_FREE_FUNC)(DAT_EP_HANDLE);
@@ -1549,7 +1549,7 @@ static inline u32 dat_ep_free(DAT_EP_HAN
         return DAT_CALL_PROVIDER_FUNC(ep_free_func, ep);
 }
 
-static inline u32 dat_ep_get_status(DAT_EP_HANDLE ep, DAT_EP_STATE *state,
+static inline u32 dat_ep_get_status(DAT_EP_HANDLE ep, enum dat_ep_state *state,
 				    boolean_t *recv_idle, boolean_t *req_idle)
 {
         return DAT_CALL_PROVIDER_FUNC(ep_get_status_func, ep, state, recv_idle,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel10/dat-provider/dapl_cr_accept.c linux-kernel11/dat-provider/dapl_cr_accept.c
--- linux-kernel10/dat-provider/dapl_cr_accept.c	2005-05-13 10:10:33.863960000 -0700
+++ linux-kernel11/dat-provider/dapl_cr_accept.c	2005-05-13 14:31:35.115006000 -0700
@@ -45,7 +45,7 @@ u32 dapl_cr_accept(DAT_CR_HANDLE cr_hand
 	DAPL_EP *ep_ptr;
 	u32 dat_status;
 	DAPL_CR *cr_ptr;
-	DAT_EP_STATE entry_ep_state;
+	enum dat_ep_state entry_ep_state;
 	DAT_EP_HANDLE entry_ep_handle;
 
 	dapl_dbg_log(DAPL_DBG_TYPE_API,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel10/dat-provider/dapl_cr_reject.c linux-kernel11/dat-provider/dapl_cr_reject.c
--- linux-kernel10/dat-provider/dapl_cr_reject.c	2005-05-12 09:28:47.883082000 -0700
+++ linux-kernel11/dat-provider/dapl_cr_reject.c	2005-05-13 14:31:35.118009000 -0700
@@ -44,7 +44,7 @@ u32 dapl_cr_reject(DAT_CR_HANDLE cr_hand
 {
 	DAPL_CR *cr_ptr;
 	DAPL_EP *ep_ptr;
-	DAT_EP_STATE entry_ep_state;
+	enum dat_ep_state entry_ep_state;
 	DAT_EP_HANDLE entry_ep_handle;
 	DAPL_SP *sp_ptr;
 	u32 dat_status;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel10/dat-provider/dapl_ep_get_status.c linux-kernel11/dat-provider/dapl_ep_get_status.c
--- linux-kernel10/dat-provider/dapl_ep_get_status.c	2005-05-12 09:28:47.433078000 -0700
+++ linux-kernel11/dat-provider/dapl_ep_get_status.c	2005-05-13 14:31:35.121014000 -0700
@@ -59,7 +59,7 @@
  *	DAT_SUCCESS
  *	DAT_INVALID_PARAMETER
  */
-u32 dapl_ep_get_status(DAT_EP_HANDLE ep_handle, DAT_EP_STATE *ep_state,
+u32 dapl_ep_get_status(DAT_EP_HANDLE ep_handle, enum dat_ep_state *ep_state,
 		       boolean_t *in_dto_idle, boolean_t *out_dto_idle)
 {
 	DAPL_EP *ep_ptr;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel10/dat-provider/dapl.h linux-kernel11/dat-provider/dapl.h
--- linux-kernel10/dat-provider/dapl.h	2005-05-13 14:22:36.958045000 -0700
+++ linux-kernel11/dat-provider/dapl.h	2005-05-13 14:33:34.971016000 -0700
@@ -598,7 +598,8 @@ extern u32 dapl_ep_post_rdma_write(DAT_E
 				   const struct dat_rmr_triplet *remote_iov,
 				   enum dat_completion_flags completion_flags);
 
-extern u32 dapl_ep_get_status(DAT_EP_HANDLE ep_handle, DAT_EP_STATE *ep_state,
+extern u32 dapl_ep_get_status(DAT_EP_HANDLE ep_handle,
+			      enum dat_ep_state *ep_state,
 			      boolean_t *in_dto_idle, boolean_t *out_dto_idle);
 
 extern u32 dapl_ep_free(DAT_EP_HANDLE ep_handle);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel10/test/dapltest/include/dapl_proto.h linux-kernel11/test/dapltest/include/dapl_proto.h
--- linux-kernel10/test/dapltest/include/dapl_proto.h	2005-05-13 14:14:08.128967000 -0700
+++ linux-kernel11/test/dapltest/include/dapl_proto.h	2005-05-13 14:31:35.137014000 -0700
@@ -531,7 +531,7 @@ const char      *DT_AsyncErr2Str (DAT_EV
 
 const char      *DT_EventToSTr (DAT_EVENT_NUMBER event_code);
 
-const char      *DT_State2Str (DAT_EP_STATE state_code);
+const char      *DT_State2Str (enum dat_ep_state state_code);
 
 enum dat_qos    DT_ParseQoS (char *arg);
 
diff -Nurp -X /home/tduffy/dontdiff linux-kernel10/test/dapltest/test/dapl_cnxn.c linux-kernel11/test/dapltest/test/dapl_cnxn.c
--- linux-kernel10/test/dapltest/test/dapl_cnxn.c	2005-05-12 09:28:43.330075000 -0700
+++ linux-kernel11/test/dapltest/test/dapl_cnxn.c	2005-05-13 14:31:35.140017000 -0700
@@ -31,7 +31,7 @@
 int
 get_ep_connection_state (DT_Tdep_Print_Head *phead, DAT_EP_HANDLE ep_handle)
 {
-    DAT_EP_STATE    ep_state;
+    enum dat_ep_state    ep_state;
     boolean_t     in_dto_idle;
     boolean_t     out_dto_idle;
     u32      ret;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel10/test/dapltest/test/dapl_util.c linux-kernel11/test/dapltest/test/dapl_util.c
--- linux-kernel10/test/dapltest/test/dapl_util.c	2005-05-12 09:34:59.380004000 -0700
+++ linux-kernel11/test/dapltest/test/dapl_util.c	2005-05-13 14:31:35.144002000 -0700
@@ -148,7 +148,7 @@ DT_EventToSTr (DAT_EVENT_NUMBER event_co
  * Map DAT_EP_STATE_CODE values to readable strings
  */
 const char *
-DT_State2Str (DAT_EP_STATE state_code)
+DT_State2Str (enum dat_ep_state state_code)
 {
     unsigned int i;
     static struct