[openib-general] [PATCH][17/19] kDAPL: Remove typedef DAT_UPCALL_POLICY

[Tom Duffy]

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

diff -Nurp -X /home/tduffy/dontdiff linux-kernel16/dat/dat.h linux-kernel17/dat/dat.h
--- linux-kernel16/dat/dat.h	2005-05-13 15:37:17.695015000 -0700
+++ linux-kernel17/dat/dat.h	2005-05-13 15:54:55.036006000 -0700
@@ -908,14 +908,15 @@ struct dat_event {
 
 /* Upcall support */
 
-typedef enum dat_upcall_policy {
+enum dat_upcall_policy {
 	DAT_UPCALL_DISABLE = 0,	        /* support no_upcalls           */
 	DAT_UPCALL_SINGLE_INSTANCE = 1,	/* support only one upcall      */
 	DAT_UPCALL_MANY = 100,          /* support multiple upcalls     */
-	DAT_UPCALL_TEARDOWN = -1	/* support no upcalls & return  */
-	                                /* after all in progress        */
-	                                /* UpCalls return               */
-} DAT_UPCALL_POLICY;
+	DAT_UPCALL_TEARDOWN = -1	/* support no upcalls & return
+					 * after all in progress
+					 * UpCalls return.
+					 */
+};
 
 typedef void (*DAT_UPCALL_FUNC) (void *, const struct dat_event *, boolean_t);
 
@@ -943,7 +944,7 @@ struct dat_provider_info {
 struct dat_evd_param {
 	DAT_IA_HANDLE ia_handle;
 	int evd_qlen;
-	DAT_UPCALL_POLICY upcall_policy;
+	enum dat_upcall_policy upcall_policy;
 	struct dat_upcall_object upcall;
 	enum dat_evd_flags evd_flags;
 };
@@ -1070,7 +1071,7 @@ struct dat_provider_attr {
 	int max_private_data_size;
 	boolean_t supports_multipath;
 	DAT_EP_CREATOR_FOR_PSP ep_creator;
-	DAT_UPCALL_POLICY upcall_policy;
+	enum dat_upcall_policy upcall_policy;
 	u32 optimal_buffer_alignment;
 	const boolean_t evd_stream_merging_supported[6][6];
 	boolean_t srq_supported;
@@ -1258,11 +1259,12 @@ typedef u32 (*DAT_IA_MEMTYPE_HINT_FUNC)(
 					DAT_MEM_OPTIMIZE_FLAGS, u64 *,
 					u64 *);
 
-typedef u32 (*DAT_EVD_KCREATE_FUNC) (DAT_IA_HANDLE, int, DAT_UPCALL_POLICY,
+typedef u32 (*DAT_EVD_KCREATE_FUNC) (DAT_IA_HANDLE, int, enum dat_upcall_policy,
 				     const struct dat_upcall_object *,
 				     enum dat_evd_flags, DAT_EVD_HANDLE *);
 
-typedef u32 (*DAT_EVD_MODIFY_UPCALL_FUNC)(DAT_EVD_HANDLE, DAT_UPCALL_POLICY,
+typedef u32 (*DAT_EVD_MODIFY_UPCALL_FUNC)(DAT_EVD_HANDLE,
+					  enum dat_upcall_policy,
 					  const struct dat_upcall_object *);
 
 struct dat_provider {
@@ -1463,7 +1465,7 @@ static inline u32 dat_evd_free(DAT_EVD_H
 }
 
 static inline u32 dat_evd_kcreate(DAT_IA_HANDLE ia, int qlen,
-				  DAT_UPCALL_POLICY policy,
+				  enum dat_upcall_policy policy,
 				  const struct dat_upcall_object *upcall,
 				  enum dat_evd_flags flags,
 				  DAT_EVD_HANDLE * evd)
@@ -1473,7 +1475,7 @@ static inline u32 dat_evd_kcreate(DAT_IA
 }
 
 static inline u32 dat_evd_modify_upcall(DAT_EVD_HANDLE evd,
-					DAT_UPCALL_POLICY policy,
+					enum dat_upcall_policy policy,
 					const struct dat_upcall_object *upcall)
 {
         return DAT_CALL_PROVIDER_FUNC(evd_modify_upcall_func, evd, policy,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel16/dat-provider/dapl_evd_kcreate.c linux-kernel17/dat-provider/dapl_evd_kcreate.c
--- linux-kernel16/dat-provider/dapl_evd_kcreate.c	2005-05-13 13:52:08.753001000 -0700
+++ linux-kernel17/dat-provider/dapl_evd_kcreate.c	2005-05-13 15:52:28.074001000 -0700
@@ -49,7 +49,7 @@
  */
 
 u32 dapl_evd_kcreate(DAT_IA_HANDLE ia_handle, int evd_min_qlen,
-		     DAT_UPCALL_POLICY upcall_policy, /* ignore */
+		     enum dat_upcall_policy upcall_policy, /* ignore */
 		     const struct dat_upcall_object *upcall,
 		     enum dat_evd_flags evd_flags, DAT_EVD_HANDLE *evd_handle)
 {
diff -Nurp -X /home/tduffy/dontdiff linux-kernel16/dat-provider/dapl_evd_modify_upcall.c linux-kernel17/dat-provider/dapl_evd_modify_upcall.c
--- linux-kernel16/dat-provider/dapl_evd_modify_upcall.c	2005-05-12 09:28:47.668011000 -0700
+++ linux-kernel17/dat-provider/dapl_evd_modify_upcall.c	2005-05-13 15:52:28.076006000 -0700
@@ -44,7 +44,7 @@
  */
 
 u32 dapl_evd_modify_upcall(DAT_EVD_HANDLE evd_handle,
-			   DAT_UPCALL_POLICY upcall_policy, /* ignore */
+			   enum dat_upcall_policy upcall_policy, /* ignore */
 			   const struct dat_upcall_object *upcall)
 {
 	DAPL_EVD *evd_ptr;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel16/dat-provider/dapl.h linux-kernel17/dat-provider/dapl.h
--- linux-kernel16/dat-provider/dapl.h	2005-05-13 14:35:01.158008000 -0700
+++ linux-kernel17/dat-provider/dapl.h	2005-05-13 15:52:28.068010000 -0700
@@ -253,7 +253,7 @@ struct dapl_ia {
 struct dapl_cno {
     DAPL_HEADER header;
     struct dat_upcall_object cno_upcall;
-    DAT_UPCALL_POLICY cno_upcall_policy;
+    enum dat_upcall_policy cno_upcall_policy;
 };
 
 /* DAPL_EVD maps to DAT_EVD_HANDLE */
@@ -512,7 +512,7 @@ extern u32 dapl_ia_memtype_hint(DAT_IA_H
 				u64 *suggested_alignment);
 
 extern u32 dapl_evd_kcreate(DAT_IA_HANDLE ia_handle, int evd_min_qlen,
-			    DAT_UPCALL_POLICY upcall_policy,
+			    enum dat_upcall_policy upcall_policy,
 			    const struct dat_upcall_object * upcall,
 			    enum dat_evd_flags evd_flags,
 			    DAT_EVD_HANDLE * evd_handle);
@@ -521,7 +521,7 @@ extern u32 dapl_evd_kquery(DAT_EVD_HANDL
 			   struct dat_evd_param *evd_args);
 
 extern u32 dapl_evd_modify_upcall(DAT_EVD_HANDLE evd_handle,
-				  DAT_UPCALL_POLICY upcall_policy,
+				  enum dat_upcall_policy upcall_policy,
 				  const struct dat_upcall_object * upcall);
 
 extern u32 dapl_evd_enable(DAT_EVD_HANDLE evd_handle);