[openib-general] [PATCH][SDP][1/22] Remove use of leading underscores in static names in sdp_actv.c

[Tom Duffy]

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

Index: drivers/infiniband/ulp/sdp/sdp_actv.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_actv.c	(revision 1929)
+++ drivers/infiniband/ulp/sdp/sdp_actv.c	(working copy)
@@ -104,9 +104,9 @@ void sdp_cm_actv_error(struct sdp_opt *c
 }
 
 /*
- * _sdp_cm_actv_establish - process an accepted connection request.
+ * sdp_cm_actv_establish - process an accepted connection request.
  */
-static int _sdp_cm_actv_establish(struct sdp_opt *conn)
+static int sdp_cm_actv_establish(struct sdp_opt *conn)
 {
 	struct ib_qp_attr *qp_attr;
 	int attr_mask = 0;
@@ -213,15 +213,15 @@ done:
 }
 
 /*
- * _sdp_cm_hello_ack_check - validate the hello ack header
+ * sdp_cm_hello_ack_check - validate the hello ack header
  */
-static int _sdp_cm_hello_ack_check(struct sdp_msg_hello_ack *hello_ack)
+static int sdp_cm_hello_ack_check(struct sdp_msg_hello_ack *hello_ack)
 {
 	/*
 	 * endian swap
 	 */
-	_sdp_msg_net_to_cpu_bsdh(&hello_ack->bsdh);
-	_sdp_msg_net_to_cpu_hah(&hello_ack->hah);
+	sdp_msg_net_to_cpu_bsdh(&hello_ack->bsdh);
+	sdp_msg_net_to_cpu_hah(&hello_ack->hah);
 	/*
 	 * validation and consistency checks
 	 */
@@ -269,8 +269,7 @@ static int _sdp_cm_hello_ack_check(struc
 /*
  * sdp_cm_rep_handler - handler for active connection open completion
  */
-int sdp_cm_rep_handler(struct ib_cm_id *cm_id,
-		       struct ib_cm_event *event,
+int sdp_cm_rep_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event,
 		       struct sdp_opt *conn)
 {
 	struct sdp_msg_hello_ack *hello_ack;
@@ -293,7 +292,7 @@ int sdp_cm_rep_handler(struct ib_cm_id *
 	 * check Hello Header Ack, to determine if we want
 	 * the connection.
 	 */
-	result = _sdp_cm_hello_ack_check(hello_ack);
+	result = sdp_cm_hello_ack_check(hello_ack);
 	if (result) {
 		sdp_dbg_warn(conn, "Error <%d> hello ack check.", result);
 		goto error;
@@ -322,7 +321,7 @@ int sdp_cm_rep_handler(struct ib_cm_id *
 	 */
 	(void)sdp_buff_pool_put(sdp_buff_q_get_head(&conn->send_post));
 
-	result = _sdp_cm_actv_establish(conn);
+	result = sdp_cm_actv_establish(conn);
 	if (result) {
 		sdp_dbg_warn(conn, "Error <%d> accept receive failed", result);
 		goto error;
@@ -333,7 +332,6 @@ error:
 	sdp_cm_actv_error(conn, (0 - result));
 
 	if (conn->state == SDP_CONN_ST_CLOSED) {
-
 		conn->cm_id = NULL;
 		sdp_conn_put(conn); /* CM reference */
 
@@ -344,16 +342,11 @@ error:
 }
 
 /*
- * _sdp_cm_path_complete - path lookup complete, initiate SDP connection
+ * sdp_cm_path_complete - path lookup complete, initiate SDP connection
  */
-static void _sdp_cm_path_complete(u64 id,
-				  int status,
-				  u32 dst_addr,
-				  u32 src_addr,
-				  u8  hw_port,
-				  struct ib_device *ca,
-				  struct ib_sa_path_rec *path,
-				  void *arg)
+static void sdp_cm_path_complete(u64 id, int status, u32 dst_addr, u32 src_addr,
+				 u8 hw_port, struct ib_device *ca,
+				 struct ib_sa_path_rec *path, void *arg)
 {
 	struct ib_cm_req_param param;
 	struct sdp_msg_hello *hello_msg;
@@ -453,8 +446,8 @@ static void _sdp_cm_path_complete(u64 id
 	/*
 	 * endian swap
 	 */
-	_sdp_msg_cpu_to_net_bsdh(&hello_msg->bsdh);
-	_sdp_msg_cpu_to_net_hh(&hello_msg->hh);
+	sdp_msg_cpu_to_net_bsdh(&hello_msg->bsdh);
+	sdp_msg_cpu_to_net_hh(&hello_msg->hh);
 	/*
 	 * save message
 	 */
@@ -505,7 +498,7 @@ static void _sdp_cm_path_complete(u64 id
 	path->packet_life = 13;
 #endif
 	conn->cm_id = ib_create_cm_id(sdp_cm_event_handler,
-				      __hashent_arg(conn->hashent));
+				      hashent_arg(conn->hashent));
 	if (!conn->cm_id) {
 		sdp_dbg_warn(conn, "Failed to create CM handle, %d",
 			     (u8)(buff->tail - buff->data));
@@ -558,7 +551,7 @@ int sdp_cm_connect(struct sdp_opt *conn)
 	result = sdp_link_path_lookup(htonl(conn->dst_addr),
 				      htonl(conn->src_addr),
 				      conn->sk->sk_bound_dev_if,
-				      _sdp_cm_path_complete,
+				      sdp_cm_path_complete,
 				      conn,
 				      &conn->plid);
 	sdp_conn_lock(conn);