[openib-general] [PATCH][2/26] kDAPL: Remove typedef DAT_PROVIDER_INFO
Tom Duffy
Tom.Duffy at Sun.COM
Mon May 9 14:39:40 PDT 2005
Signed-off-by: Tom Duffy <tduffy at sun.com>
diff -Nur -X /home/tduffy/dontdiff linux-kernel/dat/api.c linux-kernel2/dat/api.c
--- linux-kernel/dat/api.c 2005-05-09 13:44:25.023960000 -0700
+++ linux-kernel2/dat/api.c 2005-05-09 13:47:18.873960000 -0700
@@ -583,7 +583,7 @@
DAT_BOOLEAN thread_safety)
{
DAT_IA_OPEN_FUNC ia_open_func;
- DAT_PROVIDER_INFO info;
+ struct dat_provider_info info;
DAT_RETURN status;
size_t len;
@@ -658,7 +658,7 @@
dat_dbg_print(DAT_DBG_CLASS_CONSUMER_API,
"close function for IA %s failed\n", ia_name);
} else {
- DAT_PROVIDER_INFO info;
+ struct dat_provider_info info;
size_t len;
len = strlen(ia_name);
@@ -724,7 +724,7 @@
***********************************************************************/
DAT_RETURN dat_registry_add_provider(const struct dat_provider *provider,
- const DAT_PROVIDER_INFO *provider_info)
+ const struct dat_provider_info *provider_info)
{
dat_dbg_print(DAT_DBG_CLASS_PROVIDER_API,
"%s(ia:%s, ver:%x.%x, thrd_safe:%x)\n",
@@ -752,7 +752,7 @@
***********************************************************************/
DAT_RETURN dat_registry_remove_provider(const struct dat_provider *provider,
- const DAT_PROVIDER_INFO *provider_info)
+ const struct dat_provider_info *provider_info)
{
dat_dbg_print(DAT_DBG_CLASS_PROVIDER_API,
"%s(ia:%s)\n",
@@ -775,7 +775,7 @@
DAT_RETURN dat_registry_list_providers(DAT_COUNT max_to_return,
DAT_COUNT *entries_returned,
- DAT_PROVIDER_INFO *(dat_provider_list[]))
+ struct dat_provider_info *(dat_provider_list[]))
{
DAT_RETURN status;
diff -Nur -X /home/tduffy/dontdiff linux-kernel/dat/consumer.c linux-kernel2/dat/consumer.c
--- linux-kernel/dat/consumer.c 2005-05-09 11:15:26.447001000 -0700
+++ linux-kernel2/dat/consumer.c 2005-05-09 11:21:32.399003000 -0700
@@ -583,7 +583,7 @@
DAT_BOOLEAN thread_safety)
{
DAT_IA_OPEN_FUNC ia_open_func;
- DAT_PROVIDER_INFO info;
+ struct dat_provider_info info;
DAT_RETURN status;
size_t len;
@@ -653,7 +653,7 @@
dat_dbg_print(DAT_DBG_CLASS_CONSUMER_API,
"close function for IA %s failed\n", ia_name);
} else {
- DAT_PROVIDER_INFO info;
+ struct dat_provider_info info;
size_t len;
len = strlen(ia_name);
diff -Nur -X /home/tduffy/dontdiff linux-kernel/dat/dat.h linux-kernel2/dat/dat.h
--- linux-kernel/dat/dat.h 2005-05-09 11:19:35.554001000 -0700
+++ linux-kernel2/dat/dat.h 2005-05-09 11:24:22.839026000 -0700
@@ -947,12 +947,12 @@
/* Provider/registration info */
-typedef struct dat_provider_info {
+struct dat_provider_info {
char ia_name[DAT_NAME_MAX_LENGTH];
u32 dat_version_major;
u32 dat_version_minor;
DAT_BOOLEAN is_thread_safe;
-} DAT_PROVIDER_INFO;
+};
typedef struct dat_evd_param {
DAT_IA_HANDLE ia_handle;
@@ -1365,10 +1365,10 @@
*/
extern DAT_RETURN dat_registry_add_provider(
- const struct dat_provider *, const DAT_PROVIDER_INFO *);
+ const struct dat_provider *, const struct dat_provider_info *);
extern DAT_RETURN dat_registry_remove_provider(
- const struct dat_provider *, const DAT_PROVIDER_INFO *);
+ const struct dat_provider *, const struct dat_provider_info *);
/*
* DAT registry functions for consumers
@@ -1387,7 +1387,7 @@
extern DAT_RETURN dat_strerror(DAT_RETURN, const char **, const char **);
extern DAT_RETURN dat_registry_list_providers(
- DAT_COUNT, DAT_COUNT *, DAT_PROVIDER_INFO * dat_provider_list[]);
+ DAT_COUNT, DAT_COUNT *, struct dat_provider_info *dat_provider_list[]);
/*
* inline functions for consumers
diff -Nur -X /home/tduffy/dontdiff linux-kernel/dat/dictionary.c linux-kernel2/dat/dictionary.c
--- linux-kernel/dat/dictionary.c 2005-05-06 16:16:19.665002000 -0700
+++ linux-kernel2/dat/dictionary.c 2005-05-09 11:25:49.359020000 -0700
@@ -40,7 +40,7 @@
*********************************************************************/
typedef struct DAT_DICTIONARY_NODE {
- DAT_PROVIDER_INFO key;
+ struct dat_provider_info key;
DAT_DICTIONARY_DATA data;
struct DAT_DICTIONARY_NODE *prev;
struct DAT_DICTIONARY_NODE *next;
@@ -58,11 +58,13 @@
* *
*********************************************************************/
-static DAT_RETURN dat_dictionary_key_dup(const DAT_PROVIDER_INFO * old_key,
- DAT_PROVIDER_INFO * new_key);
-
-static DAT_BOOLEAN dat_dictionary_key_is_equal(const DAT_PROVIDER_INFO * key_a,
- const DAT_PROVIDER_INFO * key_b);
+static DAT_RETURN
+dat_dictionary_key_dup(const struct dat_provider_info *old_key,
+ struct dat_provider_info *new_key);
+
+static DAT_BOOLEAN
+dat_dictionary_key_is_equal(const struct dat_provider_info *key_a,
+ const struct dat_provider_info *key_b);
/*********************************************************************
* *
@@ -215,7 +217,7 @@
DAT_RETURN dat_dictionary_insert(DAT_DICTIONARY * p_dictionary,
DAT_DICTIONARY_ENTRY entry,
- const DAT_PROVIDER_INFO * key,
+ const struct dat_provider_info *key,
DAT_DICTIONARY_DATA data)
{
DAT_RETURN status;
@@ -258,7 +260,7 @@
***********************************************************************/
DAT_RETURN dat_dictionary_search(DAT_DICTIONARY * p_dictionary,
- const DAT_PROVIDER_INFO * key,
+ const struct dat_provider_info *key,
DAT_DICTIONARY_DATA * p_data)
{
DAT_DICTIONARY_NODE *cur_node;
@@ -323,7 +325,7 @@
DAT_RETURN dat_dictionary_remove(DAT_DICTIONARY * p_dictionary,
DAT_DICTIONARY_ENTRY * p_entry,
- const DAT_PROVIDER_INFO * key,
+ const struct dat_provider_info *key,
DAT_DICTIONARY_DATA * p_data)
{
DAT_DICTIONARY_NODE *cur_node, *prev_node, *next_node;
@@ -372,8 +374,8 @@
* Function: dat_dictionary_key_create
***********************************************************************/
-DAT_RETURN dat_dictionary_key_dup(const DAT_PROVIDER_INFO * old_key,
- DAT_PROVIDER_INFO * new_key)
+DAT_RETURN dat_dictionary_key_dup(const struct dat_provider_info *old_key,
+ struct dat_provider_info *new_key)
{
BUG_ON(NULL == old_key);
BUG_ON(NULL == new_key);
@@ -390,8 +392,8 @@
* Function: dat_dictionary_key_is_equal
***********************************************************************/
-DAT_BOOLEAN dat_dictionary_key_is_equal(const DAT_PROVIDER_INFO * key_a,
- const DAT_PROVIDER_INFO * key_b)
+DAT_BOOLEAN dat_dictionary_key_is_equal(const struct dat_provider_info *key_a,
+ const struct dat_provider_info *key_b)
{
BUG_ON(NULL == key_a);
BUG_ON(NULL == key_b);
diff -Nur -X /home/tduffy/dontdiff linux-kernel/dat/dictionary.h linux-kernel2/dat/dictionary.h
--- linux-kernel/dat/dictionary.h 2005-05-09 13:44:25.045967000 -0700
+++ linux-kernel2/dat/dictionary.h 2005-05-09 13:44:39.482982000 -0700
@@ -65,11 +65,11 @@
extern DAT_RETURN dat_dictionary_insert(DAT_DICTIONARY * p_dictionary,
DAT_DICTIONARY_ENTRY entry,
- const DAT_PROVIDER_INFO * key,
+ const struct dat_provider_info *key,
DAT_DICTIONARY_DATA data);
extern DAT_RETURN dat_dictionary_search(DAT_DICTIONARY * p_dictionary,
- const DAT_PROVIDER_INFO * key,
+ const struct dat_provider_info *key,
DAT_DICTIONARY_DATA * p_data);
extern DAT_RETURN dat_dictionary_enumerate(DAT_DICTIONARY * p_dictionary,
@@ -78,7 +78,7 @@
extern DAT_RETURN dat_dictionary_remove(DAT_DICTIONARY * p_dictionary,
DAT_DICTIONARY_ENTRY * p_entry,
- const DAT_PROVIDER_INFO * key,
+ const struct dat_provider_info *key,
DAT_DICTIONARY_DATA * p_data);
#endif /* DICTIONARY_H */
diff -Nur -X /home/tduffy/dontdiff linux-kernel/dat/dr.c linux-kernel2/dat/dr.c
--- linux-kernel/dat/dr.c 2005-05-09 13:44:24.969974000 -0700
+++ linux-kernel2/dat/dr.c 2005-05-09 13:45:51.683961000 -0700
@@ -98,7 +98,7 @@
* Function: dat_dr_insert
************************************************************************/
-DAT_RETURN dat_dr_insert(const DAT_PROVIDER_INFO *info,
+DAT_RETURN dat_dr_insert(const struct dat_provider_info *info,
const DAT_IA_OPEN_FUNC ia_open_func)
{
DAT_RETURN status;
@@ -144,7 +144,7 @@
* Function: dat_dr_remove
************************************************************************/
-DAT_RETURN dat_dr_remove(const DAT_PROVIDER_INFO *info)
+DAT_RETURN dat_dr_remove(const struct dat_provider_info *info)
{
DAT_DR_ENTRY *data;
DAT_DICTIONARY_ENTRY dict_entry;
@@ -184,7 +184,7 @@
* Function: dat_dr_provider_open
************************************************************************/
-DAT_RETURN dat_dr_provider_open(const DAT_PROVIDER_INFO *info,
+DAT_RETURN dat_dr_provider_open(const struct dat_provider_info *info,
DAT_IA_OPEN_FUNC *p_ia_open_func)
{
DAT_RETURN status;
@@ -209,7 +209,7 @@
* Function: dat_dr_provider_close
************************************************************************/
-DAT_RETURN dat_dr_provider_close(const DAT_PROVIDER_INFO * info)
+DAT_RETURN dat_dr_provider_close(const struct dat_provider_info *info)
{
DAT_RETURN status;
DAT_DR_ENTRY *data;
@@ -242,7 +242,7 @@
DAT_RETURN dat_dr_list(DAT_COUNT max_to_return,
DAT_COUNT *entries_returned,
- DAT_PROVIDER_INFO *(dat_provider_list[]))
+ struct dat_provider_info *(dat_provider_list[]))
{
DAT_DR_ENTRY **array;
DAT_COUNT array_size;
diff -Nur -X /home/tduffy/dontdiff linux-kernel/dat/dr.h linux-kernel2/dat/dr.h
--- linux-kernel/dat/dr.h 2005-05-09 13:44:25.063962000 -0700
+++ linux-kernel2/dat/dr.h 2005-05-09 13:48:49.034963000 -0700
@@ -46,20 +46,20 @@
extern DAT_RETURN dat_dr_fini(void);
-extern DAT_RETURN dat_dr_insert(const DAT_PROVIDER_INFO *info,
+extern DAT_RETURN dat_dr_insert(const struct dat_provider_info *info,
const DAT_IA_OPEN_FUNC ia_open_func);
-extern DAT_RETURN dat_dr_remove(const DAT_PROVIDER_INFO *info);
+extern DAT_RETURN dat_dr_remove(const struct dat_provider_info *info);
-extern DAT_RETURN dat_dr_provider_open(const DAT_PROVIDER_INFO *info,
+extern DAT_RETURN dat_dr_provider_open(const struct dat_provider_info *info,
DAT_IA_OPEN_FUNC *p_ia_open_func);
-extern DAT_RETURN dat_dr_provider_close(const DAT_PROVIDER_INFO *info);
+extern DAT_RETURN dat_dr_provider_close(const struct dat_provider_info *info);
extern DAT_RETURN dat_dr_size(DAT_COUNT *size);
extern DAT_RETURN dat_dr_list(DAT_COUNT max_to_return,
DAT_COUNT *entries_returned,
- DAT_PROVIDER_INFO *(dat_provider_list[]));
+ struct dat_provider_info *(dat_provider_list[]));
#endif /* DR_H */
diff -Nur -X /home/tduffy/dontdiff linux-kernel/dat-provider/dapl_module.c linux-kernel2/dat-provider/dapl_module.c
--- linux-kernel/dat-provider/dapl_module.c 2005-05-06 16:39:48.195002000 -0700
+++ linux-kernel2/dat-provider/dapl_module.c 2005-05-09 11:27:27.003079000 -0700
@@ -123,7 +123,7 @@
* This function is called by the registry to initialize a provider
*
*/
-void DAT_PROVIDER_INIT_FUNC_NAME(const DAT_PROVIDER_INFO * provider_info,
+void DAT_PROVIDER_INIT_FUNC_NAME(const struct dat_provider_info *provider_info,
struct ib_device *device, u8 port)
{
struct dat_provider *provider;
@@ -176,7 +176,7 @@
* This function is called by the registry to de-initialize a provider
*
*/
-void DAT_PROVIDER_FINI_FUNC_NAME(const DAT_PROVIDER_INFO * provider_info)
+void DAT_PROVIDER_FINI_FUNC_NAME(const struct dat_provider_info *provider_info)
{
struct dat_provider *provider;
DAT_RETURN dat_status;
@@ -223,7 +223,7 @@
void dapl_add_one(struct ib_device *device)
{
DAT_COUNT i;
- DAT_PROVIDER_INFO provider_info;
+ struct dat_provider_info provider_info;
int length;
dapl_dbg_log(DAPL_DBG_TYPE_UTIL,
"Inside dapl_add_one called by %s\n", device->name);
@@ -245,7 +245,7 @@
void dapl_remove_one(struct ib_device *device)
{
DAT_COUNT i;
- DAT_PROVIDER_INFO provider_info;
+ struct dat_provider_info provider_info;
int length;
dapl_dbg_log(DAPL_DBG_TYPE_UTIL,
"Inside dapl_remove_one called by %s\n", device->name);
diff -Nur -X /home/tduffy/dontdiff linux-kernel/dat-provider/dapl_module.h linux-kernel2/dat-provider/dapl_module.h
--- linux-kernel/dat-provider/dapl_module.h 2005-04-20 12:42:06.812006000 -0700
+++ linux-kernel2/dat-provider/dapl_module.h 2005-05-09 11:21:32.386004000 -0700
@@ -43,9 +43,9 @@
extern int g_dapl_dbg_type;
extern void
-DAT_PROVIDER_INIT_FUNC_NAME(const DAT_PROVIDER_INFO *,
+DAT_PROVIDER_INIT_FUNC_NAME(const struct dat_provider_info *,
struct ib_device *, u8 port);
-extern void DAT_PROVIDER_FINI_FUNC_NAME(const DAT_PROVIDER_INFO *);
+extern void DAT_PROVIDER_FINI_FUNC_NAME(const struct dat_provider_info *);
#endif /* DAPL_MODULE_H */
More information about the general
mailing list