[openib-general] [PATCH][24/26] kDAPL: Remove typedef DAT_LMR_PARAM

[Tom Duffy]

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

diff -Nur -X /home/tduffy/dontdiff linux-kernel23/dat/dat.h linux-kernel24/dat/dat.h
--- linux-kernel23/dat/dat.h	2005-05-09 14:02:35.073961000 -0700
+++ linux-kernel24/dat/dat.h	2005-05-09 14:05:28.655967000 -0700
@@ -991,7 +991,7 @@
 } DAT_REGION_DESCRIPTION;
 
 /* LMR Arguments */
-typedef struct dat_lmr_param {
+struct dat_lmr_param {
 	DAT_IA_HANDLE ia_handle;
 	DAT_MEM_TYPE mem_type;
 	DAT_REGION_DESCRIPTION region_desc;
@@ -1002,7 +1002,7 @@
 	DAT_RMR_CONTEXT rmr_context;
 	DAT_VLEN registered_size;
 	DAT_VADDR registered_address;
-} DAT_LMR_PARAM;
+};
 
 /* General Interface Adapter attributes.*/
 typedef struct dat_ia_attr {
@@ -1201,7 +1201,8 @@
 
 typedef DAT_RETURN (*DAT_LMR_FREE_FUNC) (DAT_LMR_HANDLE);
 
-typedef DAT_RETURN (*DAT_LMR_QUERY_FUNC) (DAT_LMR_HANDLE, DAT_LMR_PARAM *);
+typedef DAT_RETURN (*DAT_LMR_QUERY_FUNC) (DAT_LMR_HANDLE,
+					  struct dat_lmr_param *);
 
 typedef DAT_RETURN (*DAT_LMR_SYNC_RDMA_READ_FUNC) (
         DAT_IA_HANDLE, const struct dat_lmr_triplet *, DAT_VLEN);
@@ -1664,7 +1665,8 @@
                                       soft_high_watermark, hard_high_watermark);
 }
 
-static inline DAT_RETURN dat_lmr_query(DAT_LMR_HANDLE lmr, DAT_LMR_PARAM * param)
+static inline DAT_RETURN dat_lmr_query(DAT_LMR_HANDLE lmr,
+				       struct dat_lmr_param *param)
 {
         return DAT_CALL_PROVIDER_FUNC(lmr_query_func, lmr, param);
 }
diff -Nur -X /home/tduffy/dontdiff linux-kernel23/dat-provider/dapl.h linux-kernel24/dat-provider/dapl.h
--- linux-kernel23/dat-provider/dapl.h	2005-05-09 14:01:14.740963000 -0700
+++ linux-kernel24/dat-provider/dapl.h	2005-05-09 14:05:04.217962000 -0700
@@ -358,7 +358,7 @@
 /* DAPL_LMR maps to DAT_LMR_HANDLE */
 struct dapl_lmr {
 	DAPL_HEADER header;
-	DAT_LMR_PARAM param;
+	struct dat_lmr_param param;
 	ib_mr_handle_t mr_handle;
 	atomic_t lmr_ref_count;
 };
@@ -656,7 +656,7 @@
 				   DAT_VLEN *,	/* registered_length */
 				   DAT_VADDR *);	/* registered_address */
 
-extern DAT_RETURN dapl_lmr_query(DAT_LMR_HANDLE, DAT_LMR_PARAM *);
+extern DAT_RETURN dapl_lmr_query(DAT_LMR_HANDLE, struct dat_lmr_param *);
 
 extern DAT_RETURN dapl_lmr_free(DAT_LMR_HANDLE);
 
diff -Nur -X /home/tduffy/dontdiff linux-kernel23/dat-provider/dapl_lmr_query.c linux-kernel24/dat-provider/dapl_lmr_query.c
--- linux-kernel23/dat-provider/dapl_lmr_query.c	2005-05-04 08:19:32.665015000 -0700
+++ linux-kernel24/dat-provider/dapl_lmr_query.c	2005-05-09 14:06:13.807966000 -0700
@@ -36,7 +36,8 @@
 
 #include "dapl.h"
 
-DAT_RETURN dapl_lmr_query(DAT_LMR_HANDLE lmr_handle, DAT_LMR_PARAM * lmr_param)
+DAT_RETURN dapl_lmr_query(DAT_LMR_HANDLE lmr_handle,
+			  struct dat_lmr_param *lmr_param)
 {
 	DAPL_LMR *lmr;
 	DAT_RETURN dat_status;
@@ -58,7 +59,7 @@
 	dat_status = DAT_SUCCESS;
 	lmr = (DAPL_LMR *) lmr_handle;
 
-	memcpy(lmr_param, &lmr->param, sizeof(DAT_LMR_PARAM));
+	memcpy(lmr_param, &lmr->param, sizeof *lmr_param);
 
       bail:
 	return dat_status;
diff -Nur -X /home/tduffy/dontdiff linux-kernel23/test/dapltest/test/dapl_fft_queryinfo.c linux-kernel24/test/dapltest/test/dapl_fft_queryinfo.c
--- linux-kernel23/test/dapltest/test/dapl_fft_queryinfo.c	2005-05-09 14:01:14.763960000 -0700
+++ linux-kernel24/test/dapltest/test/dapl_fft_queryinfo.c	2005-05-09 14:05:04.246964000 -0700
@@ -66,7 +66,7 @@
     DAT_PZ_HANDLE pz_handle;
     struct dat_pz_param pz_param;
     DAT_LMR_HANDLE lmr_handle;
-    DAT_LMR_PARAM lmr_param;
+    struct dat_lmr_param lmr_param;
     DAT_LMR_CONTEXT lmr_context;
     DAT_RMR_HANDLE rmr_handle;
     struct dat_rmr_param rmr_param;