[openib-general] [PATCH][4/19] kDAPL: Remove typedef DAT_HANDLE_TYPE

[Tom Duffy]

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

diff -Nurp -X /home/tduffy/dontdiff linux-kernel3/dat/dat.h linux-kernel4/dat/dat.h
--- linux-kernel3/dat/dat.h	2005-05-13 12:33:26.944001000 -0700
+++ linux-kernel4/dat/dat.h	2005-05-13 12:42:37.630017000 -0700
@@ -334,7 +334,7 @@ enum dat_return_subtype {
 #define DAT_GET_SUBTYPE(status) ((u32)(status) & DAT_SUBTYPE_MASK)
 
 /* dat handle types */
-typedef enum dat_handle_type {
+enum dat_handle_type {
 	DAT_HANDLE_TYPE_CR,
 	DAT_HANDLE_TYPE_EP,
 	DAT_HANDLE_TYPE_EVD,
@@ -345,7 +345,7 @@ typedef enum dat_handle_type {
 	DAT_HANDLE_TYPE_RMR,
 	DAT_HANDLE_TYPE_RSP,
 	DAT_HANDLE_TYPE_SRQ
-} DAT_HANDLE_TYPE;
+};
 
 #define DAT_NAME_MAX_LENGTH     256
 
@@ -1108,7 +1108,7 @@ typedef u32 (*DAT_SET_CONSUMER_CONTEXT_F
 
 typedef u32 (*DAT_GET_CONSUMER_CONTEXT_FUNC)(DAT_HANDLE, DAT_CONTEXT *);
 
-typedef u32 (*DAT_GET_HANDLE_TYPE_FUNC)(DAT_HANDLE, DAT_HANDLE_TYPE *);
+typedef u32 (*DAT_GET_HANDLE_TYPE_FUNC)(DAT_HANDLE, enum dat_handle_type *);
 
 typedef u32 (*DAT_CR_QUERY_FUNC)(DAT_CR_HANDLE, struct dat_cr_param *);
 
@@ -1404,7 +1404,8 @@ static inline u32 dat_get_consumer_conte
 				      context);
 }
 
-static inline u32 dat_get_handle_type(DAT_HANDLE handle, DAT_HANDLE_TYPE *type)
+static inline u32 dat_get_handle_type(DAT_HANDLE handle,
+				      enum dat_handle_type *type)
 {
         return DAT_CALL_PROVIDER_FUNC(get_handle_type_func, handle, type);
 }
diff -Nurp -X /home/tduffy/dontdiff linux-kernel3/dat-provider/dapl_get_handle_type.c linux-kernel4/dat-provider/dapl_get_handle_type.c
--- linux-kernel3/dat-provider/dapl_get_handle_type.c	2005-05-12 09:28:48.437008000 -0700
+++ linux-kernel4/dat-provider/dapl_get_handle_type.c	2005-05-13 12:45:25.580018000 -0700
@@ -56,7 +56,7 @@
  * 	DAT_INVALID_PARAMETER
  */
 
-u32 dapl_get_handle_type(DAT_HANDLE dat_handle, DAT_HANDLE_TYPE *handle_type)
+u32 dapl_get_handle_type(DAT_HANDLE dat_handle, enum dat_handle_type *type)
 {
 	u32 dat_status = DAT_SUCCESS;
 	DAPL_HEADER *header;
@@ -76,8 +76,8 @@ u32 dapl_get_handle_type(DAT_HANDLE dat_
 		dat_status = DAT_ERROR(DAT_INVALID_HANDLE, 0);
 		goto bail;
 	}
-	*handle_type = header->handle_type;
+	*type = header->handle_type;
 
-      bail:
+bail:
 	return dat_status;
 }
diff -Nurp -X /home/tduffy/dontdiff linux-kernel3/dat-provider/dapl.h linux-kernel4/dat-provider/dapl.h
--- linux-kernel3/dat-provider/dapl.h	2005-05-13 12:33:26.930003000 -0700
+++ linux-kernel4/dat-provider/dapl.h	2005-05-13 12:43:32.918003000 -0700
@@ -224,7 +224,7 @@ struct dapl_hca {
 struct dapl_header {
 	struct dat_provider *provider;	/* required by DAT - must be first */
 	DAPL_MAGIC magic;	/* magic number for verification */
-	DAT_HANDLE_TYPE handle_type;	/* struct type */
+	enum dat_handle_type handle_type;	/* struct type */
 	DAPL_IA *owner_ia;	/* ia which owns this stuct */
 	DAPL_LLIST_ENTRY ia_list_entry;	/* link entry on ia struct */
 	DAT_CONTEXT user_context;	/* user context - opaque to DAPL */
@@ -489,7 +489,8 @@ extern u32 dapl_set_consumer_context(DAT
 
 extern u32 dapl_get_consumer_context(DAT_HANDLE handle, DAT_CONTEXT *context);
 
-extern u32 dapl_get_handle_type(DAT_HANDLE handle, DAT_HANDLE_TYPE *context);
+extern u32 dapl_get_handle_type(DAT_HANDLE handle,
+				enum dat_handle_type *type);
 
 /* CR Functions */