[openib-general] [PATCH][SDP][15/22] Remove use of leading underscores in static names in sdp_proto.h

[Tom Duffy]

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

Index: drivers/infiniband/ulp/sdp/sdp_proto.h
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_proto.h	(revision 1929)
+++ drivers/infiniband/ulp/sdp/sdp_proto.h	(working copy)
@@ -476,7 +476,7 @@ extern int sdp_debug_level;
 #define __SDP_DEBUG_WARN  4
 #define __SDP_DEBUG_ERROR 3
 
-#define __sdp_dbg_out(level, type, format, arg...) \
+#define sdp_dbg_out(level, type, format, arg...) \
         do { \
                 if (!(level > sdp_debug_level)) { \
                         printk("<%d>%s: " format "\n", \
@@ -484,17 +484,17 @@ extern int sdp_debug_level;
                 } \
         } while (0)
 
-#define __sdp_conn_dbg(level, type, conn, format, arg...) \
+#define sdp_conn_dbg(level, type, conn, format, arg...) \
         do { \
                 struct sdp_opt *x = (conn); \
                 if (x) { \
-                        __sdp_dbg_out(level, type, \
+                        sdp_dbg_out(level, type, \
                                       "<%d> <%04x:%04x> " format, \
                                        x->hashent, x->istate, x->state, \
                                        ## arg);                  \
                 } \
                 else {  \
-                        __sdp_dbg_out(level, type, format, ## arg); \
+                        sdp_dbg_out(level, type, format, ## arg); \
                 } \
         } while (0)
 
@@ -502,21 +502,21 @@ extern int sdp_debug_level;
 #define sdp_dbg_data(conn, format, arg...) do { } while (0)
 #else
 #define sdp_dbg_data(conn, format, arg...) \
-        __sdp_conn_dbg(__SDP_DEBUG_DATA, "DATA", conn, format, ## arg)
+        sdp_conn_dbg(__SDP_DEBUG_DATA, "DATA", conn, format, ## arg)
 #endif
 
 #if __SDP_DEBUG_LEVEL < __SDP_DEBUG_CTRL
 #define sdp_dbg_ctrl(conn, format, arg...) do { } while (0)
 #else
 #define sdp_dbg_ctrl(conn, format, arg...) \
-        __sdp_conn_dbg(__SDP_DEBUG_CTRL, "CRTL", conn, format, ## arg)
+        sdp_conn_dbg(__SDP_DEBUG_CTRL, "CRTL", conn, format, ## arg)
 #endif
 
 #if __SDP_DEBUG_LEVEL < __SDP_DEBUG_NOTE
 #define sdp_dbg_warn(conn, format, arg...) do { } while (0)
 #else
 #define sdp_dbg_warn(conn, format, arg...) \
-        __sdp_conn_dbg(__SDP_DEBUG_NOTE, "WARN", conn, format, ## arg)
+        sdp_conn_dbg(__SDP_DEBUG_NOTE, "WARN", conn, format, ## arg)
 #endif
 
 
@@ -524,21 +524,21 @@ extern int sdp_debug_level;
 #define sdp_dbg_init(format, arg...) do { } while (0)
 #else
 #define sdp_dbg_init(format, arg...) \
-        __sdp_dbg_out(__SDP_DEBUG_INIT, "INIT: ", format, ## arg)
+        sdp_dbg_out(__SDP_DEBUG_INIT, "INIT: ", format, ## arg)
 #endif
 
 #if __SDP_DEBUG_LEVEL < __SDP_DEBUG_WARN
 #define sdp_dbg_err(format, arg...) do { } while (0)
 #else
 #define sdp_dbg_err(format, arg...)  \
-        __sdp_dbg_out(__SDP_DEBUG_WARN, " ERR: ", format, ## arg)
+        sdp_dbg_out(__SDP_DEBUG_WARN, " ERR: ", format, ## arg)
 #endif
 
 #if __SDP_DEBUG_LEVEL < __SDP_DEBUG_WARN
 #define sdp_warn(format, arg...) do { } while (0)
 #else
 #define sdp_warn(format, arg...)     \
-        __sdp_dbg_out(__SDP_DEBUG_WARN, "WARN: ", format, ## arg)
+        sdp_dbg_out(__SDP_DEBUG_WARN, "WARN: ", format, ## arg)
 #endif
 
 #if __SDP_DEBUG_LEVEL < __SDP_DEBUG_CTRL
@@ -558,9 +558,9 @@ do {                                    
  */
 
 /*
- * __sdp_inet_write_space - writable space on send side
+ * sdp_inet_write_space - writable space on send side
  */
-static inline int __sdp_inet_write_space(struct sdp_opt *conn, int urg)
+static inline int sdp_inet_write_space(struct sdp_opt *conn, int urg)
 {
 	int size;
 
@@ -582,21 +582,21 @@ static inline int __sdp_inet_write_space
 }
 
 /*
- * __sdp_inet_writable - return non-zero if socket is writable
+ * sdp_inet_writable - return non-zero if socket is writable
  */
-static inline int __sdp_inet_writable(struct sdp_opt *conn)
+static inline int sdp_inet_writable(struct sdp_opt *conn)
 {
 	if (SDP_ST_MASK_OPEN & conn->istate)
-		return (__sdp_inet_write_space(conn, 0) <
+		return (sdp_inet_write_space(conn, 0) <
 			(conn->send_qud / 2)) ? 0 : 1;
 	else
 		return 0;
 }
 
 /*
- * __sdp_conn_stat_dump - dump stats to the log
+ * sdp_conn_stat_dump - dump stats to the log
  */
-static inline int __sdp_conn_stat_dump(struct sdp_opt *conn)
+static inline int sdp_conn_stat_dump(struct sdp_opt *conn)
 {
 #ifdef _SDP_CONN_STATS_REC
 	int counter;
@@ -617,9 +617,9 @@ static inline int __sdp_conn_stat_dump(s
 }
 
 /*
- * __sdp_conn_state_dump - dump state information to the log
+ * sdp_conn_state_dump - dump state information to the log
  */
-static inline int __sdp_conn_state_dump(struct sdp_opt *conn)
+static inline int sdp_conn_state_dump(struct sdp_opt *conn)
 {
 #ifdef _SDP_CONN_STATE_REC
 	int counter;