[openib-general] [PATCH] kDAPL: make some stuff static after file consolidation

[Tom Duffy]

These functions can be declared static now that we have consolidated
some of the files.

James, this patch does not, but can I delete these two functions (they
seem to be unused):

dapl_evd_qp_async_error_callback()
dapl_evd_cq_async_error_callback()

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

Index: linux-kernel/dat-provider/dapl_ia.c
===================================================================
--- linux-kernel/dat-provider/dapl_ia.c	(revision 2605)
+++ linux-kernel/dat-provider/dapl_ia.c	(working copy)
@@ -38,8 +38,8 @@
 #include "dapl_sp.h"
 #include "dapl_cr.h"
 
-struct dapl_ia *dapl_ia_alloc(struct dat_provider *provider,
-			      struct dapl_hca *hca)
+static struct dapl_ia *dapl_ia_alloc(struct dat_provider *provider,
+				     struct dapl_hca *hca)
 {
 	struct dapl_ia *ia;
 
@@ -75,7 +75,7 @@ struct dapl_ia *dapl_ia_alloc(struct dat
 	return ia;
 }
 
-u32 dapl_ia_teardown_callbacks(struct dapl_ia *ia)
+static u32 dapl_ia_teardown_callbacks(struct dapl_ia *ia)
 {
 	u32 dat_status = DAT_SUCCESS;
 
@@ -100,7 +100,7 @@ bail:
  * Performs an abrupt close of the IA
  */
 
-u32 dapl_ia_abrupt_close(struct dapl_ia *ia)
+static u32 dapl_ia_abrupt_close(struct dapl_ia *ia)
 {
 	u32 dat_status = DAT_SUCCESS;
 	struct dapl_ep *ep;
@@ -271,7 +271,7 @@ u32 dapl_ia_abrupt_close(struct dapl_ia 
  *
  */
 
-u32 dapl_ia_graceful_close(struct dapl_ia *ia)
+static u32 dapl_ia_graceful_close(struct dapl_ia *ia)
 {
 	u32 dat_status = DAT_SUCCESS;
 	u32 cur_dat_status;
@@ -555,8 +555,8 @@ void dapl_ia_link_rsp(struct dapl_ia *ia
 	spin_unlock_irqrestore(&ia->common.lock, ia->common.flags);
 }
 
-u32 dapl_ia_setup_callbacks(struct dapl_ia *ia,
-			    struct dapl_evd *async_evd)
+static u32 dapl_ia_setup_callbacks(struct dapl_ia *ia,
+				   struct dapl_evd *async_evd)
 {
 	u32 dat_status = DAT_SUCCESS;
 
Index: linux-kernel/dat-provider/dapl_evd.c
===================================================================
--- linux-kernel/dat-provider/dapl_evd.c	(revision 2605)
+++ linux-kernel/dat-provider/dapl_evd.c	(working copy)
@@ -30,6 +30,7 @@
  */
 
 #include "dapl.h"
+#include "dapl_evd.h"
 #include "dapl_cookie.h"
 #include "dapl_ia.h"
 #include "dapl_openib_util.h"
@@ -142,10 +143,10 @@ bail:
 /*
  * alloc and initialize an EVD struct
  */
-struct dapl_evd *dapl_evd_alloc(struct dapl_ia *ia, int qlen,
-				enum dat_upcall_policy upcall_policy,
-				const struct dat_upcall_object *upcall,
-				enum dat_evd_flags flags)
+static struct dapl_evd *dapl_evd_alloc(struct dapl_ia *ia, int qlen,
+				       enum dat_upcall_policy upcall_policy,
+				       const struct dat_upcall_object *upcall,
+				       enum dat_evd_flags flags)
 {
 	struct dapl_evd *evd;
 
@@ -627,7 +628,8 @@ static u32 dapl_evd_cq_poll_to_event(str
 	return status;
 }
 
-void dapl_evd_qp_async_error_callback(struct ib_event *cause, void *context)
+static void dapl_evd_qp_async_error_callback(struct ib_event *cause,
+					     void *context)
 {
 	struct dapl_ep *ep;
 	struct dapl_evd *async_evd;
@@ -666,7 +668,8 @@ void dapl_evd_qp_async_error_callback(st
 		     "dapl_evd_qp_async_error_callback () returns\n");
 }
 
-void dapl_evd_cq_async_error_callback(struct ib_event *cause, void *context)
+static void dapl_evd_cq_async_error_callback(struct ib_event *cause,
+					     void *context)
 {
 	struct dapl_evd *async_evd;
 	struct dapl_evd *evd = context;
@@ -870,7 +873,7 @@ void dapl_evd_connection_callback(struct
 
 }
 
-void dapl_evd_dto_callback(struct ib_cq *cq, void *user_context)
+static void dapl_evd_dto_callback(struct ib_cq *cq, void *user_context)
 {
 	struct dapl_evd *evd;
 	DAPL_EVD_STATE state;
Index: linux-kernel/dat-provider/dapl_sp.c
===================================================================
--- linux-kernel/dat-provider/dapl_sp.c	(revision 2605)
+++ linux-kernel/dat-provider/dapl_sp.c	(working copy)
@@ -36,7 +36,7 @@
 #include "dapl_ia.h"
 #include "dapl_openib_util.h"
 
-struct dapl_sp *dapl_sp_alloc(struct dapl_ia *ia, boolean_t is_psp)
+static struct dapl_sp *dapl_sp_alloc(struct dapl_ia *ia, boolean_t is_psp)
 {
 	struct dapl_sp *sp;
 
Index: linux-kernel/dat-provider/dapl_provider.c
===================================================================
--- linux-kernel/dat-provider/dapl_provider.c	(revision 2605)
+++ linux-kernel/dat-provider/dapl_provider.c	(working copy)
@@ -143,7 +143,7 @@ static struct dat_provider g_dapl_provid
  *                                                                   *
  *********************************************************************/
 
-void dapl_provider_list_destroy(void)
+static void dapl_provider_list_destroy(void)
 {
 	struct list_head *cur_list, *next_list;
 	struct dapl_provider_entry *cur_entry;
@@ -156,7 +156,8 @@ void dapl_provider_list_destroy(void)
 	}
 }
 
-u32 dapl_provider_list_insert(const char *name, struct dat_provider **provider)
+static u32 dapl_provider_list_insert(const char *name,
+				     struct dat_provider **provider)
 {
 	struct dapl_provider_entry *entry;
 	u32 status = DAT_SUCCESS;
@@ -210,7 +211,7 @@ error:
 	return status;
 }
 
-u32 dapl_provider_list_remove(const char *name)
+static u32 dapl_provider_list_remove(const char *name)
 {
 	struct list_head *cur_list, *next_list;
 	struct dapl_provider_entry *cur_entry;