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

[James Lentini]

Committed in revision 2610.

On Tue, 14 Jun 2005, Tom Duffy wrote:

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