[openib-general] [PATCH][1/26] kDAPL: Remove typedef DAT_PROVIDER_ATTR

[Tom Duffy]

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

Index: linux-kernel/test/dapltest/test/dapl_fft_queryinfo.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_fft_queryinfo.c	(revision 2290)
+++ linux-kernel/test/dapltest/test/dapl_fft_queryinfo.c	(working copy)
@@ -46,7 +46,7 @@ int DT_queryinfo_basic (Params_t *params
     char *dev_name;
     DAT_IA_HANDLE ia_handle;
     DAT_IA_ATTR ia_attributes;
-    DAT_PROVIDER_ATTR provider_attributes;
+    struct dat_provider_attr provider_attributes;
     DAT_EVD_HANDLE evd_handle;
     DAT_EVD_HANDLE conn_evd_handle;
     DAT_EVD_HANDLE cr_evd_handle;
Index: linux-kernel/test/dapltest/include/dapl_test_data.h
===================================================================
--- linux-kernel/test/dapltest/include/dapl_test_data.h	(revision 2290)
+++ linux-kernel/test/dapltest/include/dapl_test_data.h	(working copy)
@@ -81,7 +81,7 @@ typedef struct
     Client_Info_t   	Client_Info;
     Params_t        	Params;
     DAT_IA_ATTR         ia_attr;
-    DAT_PROVIDER_ATTR   provider_attr;
+    struct dat_provider_attr   provider_attr;
     DAT_EP_ATTR		ep_attr;
     Per_Server_Data_t   *ps_ptr;
     Transaction_Stats_t Client_Stats;
Index: linux-kernel/dat-provider/dapl_vendor.h
===================================================================
--- linux-kernel/dat-provider/dapl_vendor.h	(revision 2290)
+++ linux-kernel/dat-provider/dapl_vendor.h	(working copy)
@@ -72,8 +72,8 @@
 
 /*
  * Provider Versions
- * Returned in DAT_PROVIDER_ATTR.provider_version_major and
- * DAT_PROVIDER_ATTR.provider_version_minor
+ * Returned in struct dat_provider_attr.provider_version_major and
+ * struct dat_provider_attr.provider_version_minor
  */
 
 #define VN_PROVIDER_MAJOR	1
@@ -85,7 +85,7 @@
  * the vendor must indicate if they support DAT_MEM_TYPE_SHARED_VIRTUAL.
  * Set this value to '1' if DAT_MEM_TYPE_SHARED_VIRTUAL is supported.
  *
- * Returned in DAT_PROVIDER_ATTR.lmr_mem_types_supported
+ * Returned in struct dat_provider_attr.lmr_mem_types_supported
  */
 
 #define VN_MEM_SHARED_VIRTUAL_SUPPORT 1
Index: linux-kernel/dat-provider/dapl_ia_query.c
===================================================================
--- linux-kernel/dat-provider/dapl_ia_query.c	(revision 2290)
+++ linux-kernel/dat-provider/dapl_ia_query.c	(working copy)
@@ -63,7 +63,7 @@ DAT_RETURN
 dapl_ia_query(DAT_IA_HANDLE ia_handle,
 	      DAT_EVD_HANDLE * async_evd_handle,
 	      DAT_IA_ATTR * ia_attr,
-	      DAT_PROVIDER_ATTR * provider_attr)
+	      struct dat_provider_attr *provider_attr)
 {
 	DAPL_IA *ia_ptr;
 	DAT_RETURN dat_status;
Index: linux-kernel/dat-provider/dapl.h
===================================================================
--- linux-kernel/dat-provider/dapl.h	(revision 2290)
+++ linux-kernel/dat-provider/dapl.h	(working copy)
@@ -487,7 +487,7 @@ extern DAT_RETURN dapl_ia_close(DAT_IA_H
 extern DAT_RETURN dapl_ia_query(DAT_IA_HANDLE,
 				DAT_EVD_HANDLE *,
 				DAT_IA_ATTR *,
-				DAT_PROVIDER_ATTR *);
+				struct dat_provider_attr *);
 
 /* helper functions */
 
Index: linux-kernel/dat/api.c
===================================================================
--- linux-kernel/dat/api.c	(revision 2290)
+++ linux-kernel/dat/api.c	(working copy)
@@ -635,7 +635,7 @@ EXPORT_SYMBOL(dat_ia_openv);
 DAT_RETURN dat_ia_close(DAT_IA_HANDLE ia_handle, DAT_CLOSE_FLAGS flags)
 {
 	struct dat_provider *provider;
-	DAT_PROVIDER_ATTR provider_attr;
+	struct dat_provider_attr provider_attr;
         DAT_RETURN status;
 	const char *ia_name;
 
Index: linux-kernel/dat/dat.h
===================================================================
--- linux-kernel/dat/dat.h	(revision 2290)
+++ linux-kernel/dat/dat.h	(working copy)
@@ -1070,7 +1070,7 @@ typedef enum dat_ep_creator_for_psp {
  * that Consumer passes.
  */
 
-typedef struct dat_provider_attr {
+struct dat_provider_attr {
 	char provider_name[DAT_NAME_MAX_LENGTH];
 	u32 provider_version_major;
 	u32 provider_version_minor;
@@ -1097,7 +1097,7 @@ typedef struct dat_provider_attr {
 	DAT_BOOLEAN rdma_write_for_rdma_read_req;
 	DAT_COUNT num_provider_specific_attr;
 	DAT_NAMED_ATTR *provider_specific_attr;
-} DAT_PROVIDER_ATTR;
+};
 
 
 /***************************************************************
@@ -1115,8 +1115,9 @@ typedef DAT_RETURN (*DAT_IA_OPENV_FUNC) 
 
 typedef DAT_RETURN (*DAT_IA_CLOSE_FUNC) (DAT_IA_HANDLE, DAT_CLOSE_FLAGS);
 
-typedef DAT_RETURN (*DAT_IA_QUERY_FUNC) (
-        DAT_IA_HANDLE, DAT_EVD_HANDLE *, DAT_IA_ATTR *,	DAT_PROVIDER_ATTR *);
+typedef DAT_RETURN (*DAT_IA_QUERY_FUNC) (DAT_IA_HANDLE, DAT_EVD_HANDLE *,
+					 DAT_IA_ATTR *,
+					 struct dat_provider_attr *);
 
 typedef DAT_RETURN (*DAT_SET_CONSUMER_CONTEXT_FUNC) (DAT_HANDLE, DAT_CONTEXT);
 
@@ -1431,7 +1432,7 @@ static inline DAT_RETURN dat_ia_memtype_
 static inline DAT_RETURN dat_ia_query(DAT_IA_HANDLE ia, 
                                       DAT_EVD_HANDLE * async_evd,
                                       DAT_IA_ATTR * ia_attr,
-                                      DAT_PROVIDER_ATTR * provider_attr)
+                                      struct dat_provider_attr *provider_attr)
 {
         return DAT_CALL_PROVIDER_FUNC(
                 ia_query_func, ia, async_evd, ia_attr, provider_attr);