[openib-general] [PATCH][8/19] kDAPL: Remove typedef DAT_PSP_FLAGS

[Tom Duffy]

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

diff -Nurp -X /home/tduffy/dontdiff linux-kernel7/dat/dat.h linux-kernel8/dat/dat.h
--- linux-kernel7/dat/dat.h	2005-05-13 13:53:31.679965000 -0700
+++ linux-kernel8/dat/dat.h	2005-05-13 14:08:19.213960000 -0700
@@ -450,10 +450,10 @@ enum dat_evd_flags {
 	DAT_EVD_DEFAULT_FLAG = 0x1F0
 };
 
-typedef enum dat_psp_flags {
+enum dat_psp_flags {
 	DAT_PSP_CONSUMER_FLAG = 0x00,	/* Consumer creates an Endpoint */
 	DAT_PSP_PROVIDER_FLAG = 0x01	/* Provider creates an Endpoint */
-} DAT_PSP_FLAGS;
+};
 
 /*
  * Memory Buffers
@@ -684,7 +684,7 @@ struct dat_psp_param {
 	DAT_IA_HANDLE ia_handle;
 	DAT_CONN_QUAL conn_qual;
 	DAT_EVD_HANDLE evd_handle;
-	DAT_PSP_FLAGS psp_flags;
+	enum dat_psp_flags psp_flags;
 };
 
 /* RSP Parameters */
@@ -1210,10 +1210,10 @@ typedef u32 (*DAT_RMR_BIND_FUNC)(DAT_RMR
 typedef u32 (*DAT_RMR_FREE_FUNC)(DAT_RMR_HANDLE);
 
 typedef u32 (*DAT_PSP_CREATE_FUNC)(DAT_IA_HANDLE, DAT_CONN_QUAL, DAT_EVD_HANDLE,
-				   DAT_PSP_FLAGS, DAT_PSP_HANDLE *);
+				   enum dat_psp_flags, DAT_PSP_HANDLE *);
 
 typedef u32 (*DAT_PSP_CREATE_ANY_FUNC)(DAT_IA_HANDLE, DAT_CONN_QUAL *,
-				       DAT_EVD_HANDLE, DAT_PSP_FLAGS,
+				       DAT_EVD_HANDLE, enum dat_psp_flags,
 				       DAT_PSP_HANDLE *);
 
 typedef u32 (*DAT_PSP_QUERY_FUNC)(DAT_PSP_HANDLE, struct dat_psp_param *);
@@ -1678,7 +1678,7 @@ static inline u32 dat_rmr_free(DAT_RMR_H
 }
 
 static inline u32 dat_psp_create(DAT_IA_HANDLE ia, DAT_CONN_QUAL conn_qual,
-				 DAT_EVD_HANDLE evd, DAT_PSP_FLAGS flags,
+				 DAT_EVD_HANDLE evd, enum dat_psp_flags flags,
 				 DAT_PSP_HANDLE *psp)
 {
         return DAT_CALL_PROVIDER_FUNC(psp_create_func, ia, conn_qual, evd,
@@ -1686,7 +1686,8 @@ static inline u32 dat_psp_create(DAT_IA_
 }
 
 static inline u32 dat_psp_create_any(DAT_IA_HANDLE ia, DAT_CONN_QUAL *conn_qual,
-				     DAT_EVD_HANDLE evd, DAT_PSP_FLAGS flags,
+				     DAT_EVD_HANDLE evd,
+				     enum dat_psp_flags flags,
 				     DAT_PSP_HANDLE *psp)
 {
         return DAT_CALL_PROVIDER_FUNC(psp_create_any_func, ia, conn_qual, evd,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel7/dat-provider/dapl.h linux-kernel8/dat-provider/dapl.h
--- linux-kernel7/dat-provider/dapl.h	2005-05-13 13:54:33.483962000 -0700
+++ linux-kernel8/dat-provider/dapl.h	2005-05-13 14:09:01.172975000 -0700
@@ -386,7 +386,7 @@ struct dapl_sp {
 	DAT_IA_HANDLE ia_handle;
 	DAT_CONN_QUAL conn_qual;
 	DAT_EVD_HANDLE evd_handle;
-	DAT_PSP_FLAGS psp_flags;
+	enum dat_psp_flags psp_flags;
 	DAT_EP_HANDLE ep_handle;
 
 	/* maintenence fields */
@@ -665,13 +665,14 @@ extern u32 dapl_rmr_free(DAT_RMR_HANDLE)
 /* PSP Functions */
 
 extern u32 dapl_psp_create(DAT_IA_HANDLE ia_handle, DAT_CONN_QUAL conn_qual,
-			   DAT_EVD_HANDLE evd_handle, DAT_PSP_FLAGS psp_flags,
+			   DAT_EVD_HANDLE evd_handle,
+			   enum dat_psp_flags psp_flags,
 			   DAT_PSP_HANDLE *psp_handle);
 
 extern u32 dapl_psp_create_any(DAT_IA_HANDLE ia_handle,
 			       DAT_CONN_QUAL *conn_qual,
 			       DAT_EVD_HANDLE evd_handle,
-			       DAT_PSP_FLAGS psp_flags,
+			       enum dat_psp_flags psp_flags,
 			       DAT_PSP_HANDLE *psp_handle);
 
 extern u32 dapl_psp_query(DAT_PSP_HANDLE, struct dat_psp_param *);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel7/dat-provider/dapl_psp_create_any.c linux-kernel8/dat-provider/dapl_psp_create_any.c
--- linux-kernel7/dat-provider/dapl_psp_create_any.c	2005-05-12 09:28:47.294000000 -0700
+++ linux-kernel8/dat-provider/dapl_psp_create_any.c	2005-05-13 14:07:18.810968000 -0700
@@ -71,7 +71,7 @@
  * 	DAT_MODEL_NOT_SUPPORTED
  */
 u32 dapl_psp_create_any(DAT_IA_HANDLE ia_handle, DAT_CONN_QUAL *conn_qual,
-			DAT_EVD_HANDLE evd_handle, DAT_PSP_FLAGS psp_flags,
+			DAT_EVD_HANDLE evd_handle, enum dat_psp_flags psp_flags,
 			DAT_PSP_HANDLE *psp_handle)
 {
 	DAPL_IA *ia_ptr;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel7/dat-provider/dapl_psp_create.c linux-kernel8/dat-provider/dapl_psp_create.c
--- linux-kernel7/dat-provider/dapl_psp_create.c	2005-05-12 09:28:47.016004000 -0700
+++ linux-kernel8/dat-provider/dapl_psp_create.c	2005-05-13 14:07:18.807965000 -0700
@@ -68,7 +68,7 @@
  * 	DAT_MODEL_NOT_SUPPORTED
  */
 u32 dapl_psp_create(DAT_IA_HANDLE ia_handle, DAT_CONN_QUAL conn_qual,
-		    DAT_EVD_HANDLE evd_handle, DAT_PSP_FLAGS psp_flags,
+		    DAT_EVD_HANDLE evd_handle, enum dat_psp_flags psp_flags,
 		    DAT_PSP_HANDLE *psp_handle)
 {
 	DAPL_IA *ia_ptr;