[openib-general] [PATCH][23/26] kDAPL: Remove typedef DAT_EVD_PARAM

[Tom Duffy]

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

diff -Nur -X /home/tduffy/dontdiff linux-kernel22/dat/dat.h linux-kernel23/dat/dat.h
--- linux-kernel22/dat/dat.h	2005-05-09 13:55:55.040963000 -0700
+++ linux-kernel23/dat/dat.h	2005-05-09 14:02:35.073961000 -0700
@@ -955,13 +955,13 @@
 	DAT_BOOLEAN is_thread_safe;
 };
 
-typedef struct dat_evd_param {
+struct dat_evd_param {
 	DAT_IA_HANDLE ia_handle;
 	DAT_COUNT evd_qlen;
 	DAT_UPCALL_POLICY upcall_policy;
 	struct dat_upcall_object upcall;
 	DAT_EVD_FLAGS evd_flags;
-} DAT_EVD_PARAM;
+};
 
 /*
  * Memory types
@@ -1144,7 +1144,8 @@
 
 typedef DAT_RETURN (*DAT_EVD_FREE_FUNC) (DAT_EVD_HANDLE);
 
-typedef DAT_RETURN (*DAT_EVD_QUERY_FUNC) (DAT_EVD_HANDLE, DAT_EVD_PARAM *);
+typedef DAT_RETURN (*DAT_EVD_QUERY_FUNC) (DAT_EVD_HANDLE,
+					  struct dat_evd_param *);
 
 typedef DAT_RETURN (*DAT_EP_CREATE_FUNC) (
         DAT_IA_HANDLE, DAT_PZ_HANDLE, DAT_EVD_HANDLE, DAT_EVD_HANDLE, 
@@ -1507,7 +1508,7 @@
 }
 
 static inline DAT_RETURN dat_evd_query(DAT_EVD_HANDLE evd, 
-                                       DAT_EVD_PARAM * param)
+                                       struct dat_evd_param *param)
 {
         return DAT_CALL_PROVIDER_FUNC(evd_query_func, evd, param);
 }
diff -Nur -X /home/tduffy/dontdiff linux-kernel22/dat-provider/dapl_evd_kquery.c linux-kernel23/dat-provider/dapl_evd_kquery.c
--- linux-kernel22/dat-provider/dapl_evd_kquery.c	2005-05-04 08:19:32.761994000 -0700
+++ linux-kernel23/dat-provider/dapl_evd_kquery.c	2005-05-09 14:03:05.011028000 -0700
@@ -38,7 +38,8 @@
 
 #include "dapl.h"
 
-DAT_RETURN dapl_evd_kquery(DAT_EVD_HANDLE evd_handle, DAT_EVD_PARAM * evd_param)
+DAT_RETURN dapl_evd_kquery(DAT_EVD_HANDLE evd_handle,
+			   struct dat_evd_param *evd_param)
 {
 	DAPL_EVD *evd_ptr;
 	DAT_RETURN dat_status;
@@ -53,7 +54,7 @@
 	/* Note: the spec. allows for events to be directed to a NULL EVD */
 	/* with handle of type DAT_HANDLE_NULL. See 6.3.1                 */
 	if (DAT_HANDLE_NULL == evd_handle) {
-		memset(evd_param, 0, sizeof(DAT_EVD_PARAM));
+		memset(evd_param, 0, sizeof *evd_param);
 	} else {
 		if (DAPL_BAD_HANDLE(evd_handle, DAPL_MAGIC_EVD)) {
 			dat_status = DAT_ERROR(DAT_INVALID_HANDLE, 0);
diff -Nur -X /home/tduffy/dontdiff linux-kernel22/dat-provider/dapl.h linux-kernel23/dat-provider/dapl.h
--- linux-kernel22/dat-provider/dapl.h	2005-05-09 13:59:10.723960000 -0700
+++ linux-kernel23/dat-provider/dapl.h	2005-05-09 14:01:14.740963000 -0700
@@ -529,7 +529,7 @@
 				   DAT_EVD_HANDLE *);	/* evd_handle */
 
 extern DAT_RETURN dapl_evd_kquery(DAT_EVD_HANDLE,	/* evd_handle */
-				  DAT_EVD_PARAM *);	/* evd_args */
+				  struct dat_evd_param *);	/* evd_args */
 
 extern DAT_RETURN dapl_evd_modify_upcall(DAT_EVD_HANDLE,	/* evd_handle */
 					 DAT_UPCALL_POLICY,	/* upcall_policy */
diff -Nur -X /home/tduffy/dontdiff linux-kernel22/test/dapltest/test/dapl_fft_queryinfo.c linux-kernel23/test/dapltest/test/dapl_fft_queryinfo.c
--- linux-kernel22/test/dapltest/test/dapl_fft_queryinfo.c	2005-05-09 12:55:09.772004000 -0700
+++ linux-kernel23/test/dapltest/test/dapl_fft_queryinfo.c	2005-05-09 14:01:14.763960000 -0700
@@ -58,7 +58,7 @@
 #ifndef __KDAPLTEST__
     DAT_CNO_PARAM  cno_param;
 #endif
-    DAT_EVD_PARAM  evd_param;
+    struct dat_evd_param  evd_param;
     DAT_PSP_HANDLE  psp_handle;
     struct dat_psp_param psp_param;
     DAT_RSP_HANDLE  rsp_handle;