[openib-general] [PATCH][12/26] kDAPL: Remove typedef DAT_PSP_PARAM

[Tom Duffy]

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

diff -Nur -X /home/tduffy/dontdiff linux-kernel11/dat/dat.h linux-kernel12/dat/dat.h
--- linux-kernel11/dat/dat.h	2005-05-09 12:47:11.494001000 -0700
+++ linux-kernel12/dat/dat.h	2005-05-09 12:50:54.204001000 -0700
@@ -695,12 +695,12 @@
 
 /* PSP Parameters */
 
-typedef struct dat_psp_param {
+struct dat_psp_param {
 	DAT_IA_HANDLE ia_handle;
 	DAT_CONN_QUAL conn_qual;
 	DAT_EVD_HANDLE evd_handle;
 	DAT_PSP_FLAGS psp_flags;
-} DAT_PSP_PARAM;
+};
 
 /* RSP Parameters */
 
@@ -1224,7 +1224,8 @@
         DAT_IA_HANDLE, DAT_CONN_QUAL *, DAT_EVD_HANDLE, DAT_PSP_FLAGS,
         DAT_PSP_HANDLE *);
 
-typedef DAT_RETURN (*DAT_PSP_QUERY_FUNC) (DAT_PSP_HANDLE, DAT_PSP_PARAM *);
+typedef DAT_RETURN (*DAT_PSP_QUERY_FUNC) (DAT_PSP_HANDLE,
+					  struct dat_psp_param *);
 
 typedef DAT_RETURN (*DAT_PSP_FREE_FUNC) (DAT_PSP_HANDLE);
 
@@ -1731,7 +1732,8 @@
                 psp_create_any_func, ia, conn_qual, evd, flags, psp);
 }
 
-static inline DAT_RETURN dat_psp_query(DAT_PSP_HANDLE psp, DAT_PSP_PARAM * param)
+static inline DAT_RETURN dat_psp_query(DAT_PSP_HANDLE psp,
+				       struct dat_psp_param *param)
 {
         return DAT_CALL_PROVIDER_FUNC(psp_query_func, psp, param);
 }
diff -Nur -X /home/tduffy/dontdiff linux-kernel11/dat-provider/dapl.h linux-kernel12/dat-provider/dapl.h
--- linux-kernel11/dat-provider/dapl.h	2005-05-09 12:46:47.275001000 -0700
+++ linux-kernel12/dat-provider/dapl.h	2005-05-09 12:49:51.381002000 -0700
@@ -700,7 +700,7 @@
 				      DAT_PSP_FLAGS,	/* psp_flags */
 				      DAT_PSP_HANDLE *);	/* psp_handle */
 
-extern DAT_RETURN dapl_psp_query(DAT_PSP_HANDLE, DAT_PSP_PARAM *);
+extern DAT_RETURN dapl_psp_query(DAT_PSP_HANDLE, struct dat_psp_param *);
 
 extern DAT_RETURN dapl_psp_free(DAT_PSP_HANDLE);	/* psp_handle */
 
diff -Nur -X /home/tduffy/dontdiff linux-kernel11/dat-provider/dapl_psp_query.c linux-kernel12/dat-provider/dapl_psp_query.c
--- linux-kernel11/dat-provider/dapl_psp_query.c	2005-05-04 08:19:32.834965000 -0700
+++ linux-kernel12/dat-provider/dapl_psp_query.c	2005-05-09 12:51:13.571014000 -0700
@@ -38,7 +38,8 @@
 
 #include "dapl.h"
 
-DAT_RETURN dapl_psp_query(DAT_PSP_HANDLE psp_handle, DAT_PSP_PARAM * psp_param)
+DAT_RETURN dapl_psp_query(DAT_PSP_HANDLE psp_handle,
+			  struct dat_psp_param *psp_param)
 {
 	DAPL_SP *sp_ptr;
 	DAT_RETURN status;
diff -Nur -X /home/tduffy/dontdiff linux-kernel11/test/dapltest/test/dapl_fft_queryinfo.c linux-kernel12/test/dapltest/test/dapl_fft_queryinfo.c
--- linux-kernel11/test/dapltest/test/dapl_fft_queryinfo.c	2005-05-09 12:47:58.187003000 -0700
+++ linux-kernel12/test/dapltest/test/dapl_fft_queryinfo.c	2005-05-09 12:51:27.837003000 -0700
@@ -60,7 +60,7 @@
 #endif
     DAT_EVD_PARAM  evd_param;
     DAT_PSP_HANDLE  psp_handle;
-    DAT_PSP_PARAM  psp_param;
+    struct dat_psp_param psp_param;
     DAT_RSP_HANDLE  rsp_handle;
     DAT_RSP_PARAM  rsp_param;
     DAT_PZ_HANDLE pz_handle;