[openib-general] sdp_kvec.c

Michael S. Tsirkin mst at mellanox.co.il
Thu Feb 24 12:58:34 PST 2005


Quoting r. Libor Michalek <libor at topspin.com>:
> > What do you say to removing the comments after the closing }?
> > Its clearly unnecessary (most functions are, or shall be, short enough
> > to see where they end), and increases the code footprint.
> > For me, they make the detection of the function end harder rather than
> > easier, since I am always looking for a sole }.
> 
>   OK, I'll stop adding them to new functions, and remove them as I
> touch code. If I or anyone else get's ambitious we can strip them
> from all the functions.
> 
> -Libor
> 

Here's a patch.
Signed-off-by: Michael S. Tsirkin <mst at mellanox.co.il>

Index: sdp_queue.h
===================================================================
--- sdp_queue.h	(revision 1906)
+++ sdp_queue.h	(working copy)
@@ -76,7 +76,7 @@ struct sdpc_desc_q {
 static inline int __sdp_desc_q_size(struct sdpc_desc_q *table)
 {
 	return table->size;
-} /* __sdp_desc_q_size */
+}
 
 /*
  * __sdp_desc_q_member - return non-zero if element is in a table
@@ -84,7 +84,7 @@ static inline int __sdp_desc_q_size(stru
 static inline int __sdp_desc_q_member(struct sdpc_desc *element)
 {
 	return ((NULL == element->table) ? 0 : 1);
-} /* __sdp_desc_q_member */
+}
 
 #define sdp_desc_q_size(x)   __sdp_desc_q_size(x)
 #define sdp_desc_q_member(x) __sdp_desc_q_member(x)
Index: sdp_write.c
===================================================================
--- sdp_write.c	(revision 1906)
+++ sdp_write.c	(working copy)
@@ -175,4 +175,4 @@ int sdp_event_write(struct sdp_opt *conn
 	return 0;
 error:
 	return result;
-} /* sdp_event_write */
+}
Index: sdp_link.c
===================================================================
--- sdp_link.c	(revision 1906)
+++ sdp_link.c	(working copy)
@@ -93,7 +93,7 @@ static void _sdp_link_path_complete(u64 
 
 	info->use = jiffies;
 	return;
-} /* _sdp_link_path_complete */
+}
 
 /*
  * _sdp_path_wait_add - add a wait entry into the wait list for a path
@@ -110,7 +110,7 @@ static void _sdp_path_wait_add(struct sd
 		wait->next->pext = &wait->next;
 
 	return;
-} /* _sdp_path_wait_add */
+}
 
 /*
  * _sdp_path_wait_destroy - destroy an entry for a wait element
@@ -133,7 +133,7 @@ static void _sdp_path_wait_destroy(struc
 	kmem_cache_free(_wait_cache, wait);
 
 	return;
-} /* _sdp_path_wait_destroy */
+}
 
 /*
  * _sdp_path_wait_complete - complete an entry for a wait element
@@ -151,7 +151,7 @@ static void _sdp_path_wait_complete(stru
 	_sdp_path_wait_destroy(wait);
 
 	return;
-} /* _sdp_path_wait_complete */
+}
 
 /*
  * _sdp_path_info_lookup - lookup a path record entry
@@ -165,7 +165,7 @@ static struct sdp_path_info *_sdp_path_i
 			break;
 
 	return info;
-} /* _sdp_path_info_lookup */
+}
 
 /*
  * _sdp_path_info_create - create an entry for a path record element
@@ -196,7 +196,7 @@ static struct sdp_path_info *_sdp_path_i
 	INIT_WORK(&info->timer, _sdp_link_path_lookup, info);
 
 	return info;
-} /* _sdp_path_info_create */
+}
 
 /*
  * _sdp_path_info_destroy - destroy an entry for a path record element
@@ -224,7 +224,7 @@ static void _sdp_path_info_destroy(struc
 	kmem_cache_free(_info_cache, info);
 
 	return;
-} /* _sdp_path_info_destroy */
+}
 
 /*
  * _sdp_link_path_rec_done - path record completion function
@@ -292,7 +292,7 @@ static void _sdp_link_path_rec_done(int 
 	}
 
 	return;
-} /* _sdp_link_path_rec_done */
+}
 
 /*
  * _sdp_link_path_rec_get - resolve GIDs to a path record
@@ -330,7 +330,7 @@ static int _sdp_link_path_rec_get(struct
 	}
 
 	return result;
-} /* _sdp_link_path_rec_get */
+}
 
 /*
  * _sdp_link_path_lookup - resolve an ip address to a path record
@@ -435,7 +435,7 @@ void _sdp_link_path_lookup(void *data)
 			     rt->rt_src);
 		result = -ENODEV;
 		goto error;
-	} /* if */
+	}
 	/*
 	 * lookup local info.
 	 */
@@ -527,7 +527,7 @@ done:
 error:
 	_sdp_path_info_destroy(info, result);
 	return;
-} /* _sdp_link_path_lookup */
+}
 
 /*
  * Public functions
@@ -600,7 +600,7 @@ int sdp_link_path_lookup(u32 dst_addr,  
 	return 0;
 error:
 	return result;
-} /* sdp_link_path_lookup */
+}
 
 /*
  * timers
@@ -634,7 +634,7 @@ static void _sdp_link_sweep(void *data)
 
 	queue_delayed_work(_link_wq, &_link_timer, SDP_LINK_SWEEP_INTERVAL);
 	return;
-} /* _sdp_link_sweep */
+}
 
 /*
  * Arp packet reception for completions
@@ -688,7 +688,7 @@ done:
 	kfree_skb(skb);
 	kfree(work);
 	return;
-} /* _sdp_link_arp_work */
+}
 
 /*
  * _sdp_link_arp_recv - receive all ARP packets
@@ -721,7 +721,7 @@ static int _sdp_link_arp_recv(struct sk_
 done:
 	kfree_skb(skb);
 	return 0;
-} /* _sdp_link_arp_recv */
+}
 
 /*
  * primary initialization/cleanup functions
@@ -751,7 +751,7 @@ int sdp_link_addr_init(void)
 	if (0 != result) {
 		
 		goto error_async;
-	} /* if */
+	}
 #endif
 	_info_cache = kmem_cache_create("sdp_path_info",
 					sizeof(struct sdp_path_info),
@@ -799,7 +799,7 @@ error_wait:
 	kmem_cache_destroy(_info_cache);
 error_path:
 	return result;
-} /* sdp_link_addr_init */
+}
 
 /*
  * sdp_link_addr_cleanup - cleanup the link address retrival code
@@ -837,4 +837,4 @@ int sdp_link_addr_cleanup(void)
 #endif
 
 	return 0;
-} /* sdp_link_addr_cleanup */
+}
Index: sdp_rcvd.c
===================================================================
--- sdp_rcvd.c	(revision 1906)
+++ sdp_rcvd.c	(working copy)
@@ -112,7 +112,7 @@ static int _sdp_rcvd_disconnect(struct s
 	return 0;
 error:
 	return result;
-} /* _sdp_rcvd_disconnect */
+}
 
 static int _sdp_rcvd_abort(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -142,7 +142,7 @@ static int _sdp_rcvd_abort(struct sdp_op
 	}
 
 	return result;
-} /* _sdp_rcvd_abort */
+}
 
 static int _sdp_rcvd_send_sm(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -185,7 +185,7 @@ static int _sdp_rcvd_send_sm(struct sdp_
 	}
 
 	return 0;
-} /* _sdp_rcvd_send_sm */
+}
 
 static int _sdp_rcvd_rdma_wr(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -246,7 +246,7 @@ static int _sdp_rcvd_rdma_wr(struct sdp_
 	return 0;
 error:
 	return result;
-} /* _sdp_rcvd_rdma_wr */
+}
 
 static int _sdp_rcvd_rdma_rd(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -328,7 +328,7 @@ static int _sdp_rcvd_rdma_rd(struct sdp_
 	return 0;
 error:
 	return result;
-} /* _sdp_rcvd_rdma_rd */
+}
 
 static int _sdp_rcvd_mode_change(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -424,7 +424,7 @@ mode_error:
 		     SDP_MSG_MCH_GET_MODE(mch));
 error:
 	return result;
-} /* _sdp_rcvd_mode_change */
+}
 
 static int _sdp_rcvd_src_cancel(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -514,7 +514,7 @@ static int _sdp_rcvd_src_cancel(struct s
 	return 0;
 done:
 	return result;
-} /* _sdp_rcvd_src_cancel */
+}
 
 static int _sdp_rcvd_snk_cancel(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -585,7 +585,7 @@ static int _sdp_rcvd_snk_cancel(struct s
 	return 0;
 done:
 	return result;
-} /* _sdp_rcvd_snk_cancel */
+}
 
 /*
  * _sdp_rcvd_snk_cancel_ack - sink cancel confirmantion
@@ -624,7 +624,7 @@ static int _sdp_rcvd_snk_cancel_ack(stru
 	return 0;
 done:
 	return result;
-} /* _sdp_rcvd_snk_cancel_ack */
+}
 
 /*
  * _sdp_rcvd_resize_buff_ack - buffer size change request
@@ -657,7 +657,7 @@ static int _sdp_rcvd_resize_buff_ack(str
 	return 0;
 error:
 	return result;
-} /* _sdp_rcvd_resize_buff_ack */
+}
 
 static int _sdp_rcvd_suspend(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -669,12 +669,12 @@ static int _sdp_rcvd_suspend(struct sdp_
 	_sdp_msg_net_to_cpu_sch(sch);
 
 	return 0;
-} /* _sdp_rcvd_suspend */
+}
 
 static int _sdp_rcvd_suspend_ack(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
 	return 0;
-} /* _sdp_rcvd_suspend_ack */
+}
 
 static int _sdp_rcvd_snk_avail(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -808,7 +808,7 @@ consume:
 	 */
 error:
 	return result;
-} /* _sdp_rcvd_snk_avail */
+}
 
 static int _sdp_rcvd_src_avail(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -975,7 +975,7 @@ advt_error:
 	(void)sdp_advt_destroy(advt);
 done:
 	return result;
-} /* _sdp_rcvd_src_avail */
+}
 
 /*
  * _sdp_rcvd_data - SDP data message event received
@@ -1020,7 +1020,7 @@ static int _sdp_rcvd_data(struct sdp_opt
 	conn->byte_strm += ret_val;
 	
 	return ret_val;
-} /* _sdp_rcvd_sata */
+}
 
 /*
  * _sdp_rcvd_unsupported - Valid messages we're not expecting
@@ -1036,7 +1036,7 @@ static int _sdp_rcvd_unsupported(struct 
 		     buff->bsdh_hdr->mid);
 
 	return 0;
-} /* _sdp_rcvd_unsupported */
+}
 
 /*
  * Event Dispatch table. For performance a dispatch table is used to avoid
@@ -1253,4 +1253,4 @@ drop:
 	(void)sdp_buff_pool_put(buff);
 done:
 	return result;
-} /* sdp_event_recv */
+}
Index: sdp_inet.c
===================================================================
--- sdp_inet.c	(revision 1906)
+++ sdp_inet.c	(working copy)
@@ -121,7 +121,7 @@ void sdp_inet_wake_send(struct sock *sk)
 		sk_wake_async(sk, 2, POLL_OUT);
 		read_unlock(&sk->sk_callback_lock);
 	}
-} /* sdp_inet_wake_send */
+}
 
 /*
  * sdp_inet_wake_generic - wake up a socket
@@ -136,7 +136,7 @@ void sdp_inet_wake_generic(struct sock *
 
 		read_unlock(&sk->sk_callback_lock);
 	}
-} /* sdp_inet_wake_generic */
+}
 
 /*
  * sdp_inet_wake_recv - wake up a socket for read
@@ -151,7 +151,7 @@ void sdp_inet_wake_recv(struct sock *sk,
 		sk_wake_async(sk, 1, POLL_IN);
 		read_unlock(&sk->sk_callback_lock);
 	}
-} /* sdp_inet_wake_recv */
+}
 
 /*
  * sdp_inet_wake_error - wake up a socket for error
@@ -166,7 +166,7 @@ void sdp_inet_wake_error(struct sock *sk
 		sk_wake_async(sk, 0, POLL_ERR);
 		read_unlock(&sk->sk_callback_lock);
 	}
-} /* sdp_inet_wake_error */
+}
 
 /*
  * sdp_inet_wake_urg - wake up a socket for urgent data
@@ -180,7 +180,7 @@ void sdp_inet_wake_urg(struct sock *sk)
 	if (NULL != sk)
 		sk_send_sigurg(sk);
 
-} /* sdp_inet_wake_urg */
+}
 
 /*
  * internal socket/handle managment functions
@@ -231,7 +231,7 @@ static int _sdp_inet_abort(struct sdp_op
 	}
 
 	return result;
-} /* _sdp_inet_abort */
+}
 
 /*
  * _sdp_inet_disconnect - disconnect a connection
@@ -290,7 +290,7 @@ static int _sdp_inet_disconnect(struct s
 	}
 
 	return result;
-} /* _sdp_inet_disconnect */
+}
 
 /*
  * Linux SOCKET interface, module specific functions
@@ -404,7 +404,7 @@ static int _sdp_inet_release(struct sock
 
 			set_current_state(TASK_RUNNING);
 			remove_wait_queue(sk->sk_sleep, &wait);
-		} /* if (linger) */
+		}
 #if 0
 		/*
 		 * On a blocking socket, if still draining after linger,
@@ -419,7 +419,7 @@ static int _sdp_inet_release(struct sock
 			SDP_EXPECT(!(0 > result));
 		}
 #endif
-	} /* if (blocking) */
+	}
 
 done:
 	if (0 < (SDP_ST_MASK_CLOSED & conn->istate))
@@ -433,7 +433,7 @@ done:
 	sdp_conn_put(conn);
 
 	return 0;
-} /* _sdp_inet_release */
+}
 
 /*
  * _sdp_inet_bind - bind a socket to an address/interface
@@ -525,7 +525,7 @@ static int _sdp_inet_bind(struct socket 
 done:
 	sdp_conn_unlock(conn);
 	return result;
-} /* _sdp_inet_bind */
+}
 
 /*
  * _sdp_inet_connect - connect a socket to a remote address
@@ -696,7 +696,7 @@ static int _sdp_inet_connect(struct sock
 done:
 	sdp_conn_unlock(conn);
 	return result;
-} /* _sdp_inet_connect */
+}
 
 /*
  * _sdp_inet_listen - listen on a socket for incomming addresses
@@ -753,7 +753,7 @@ static int _sdp_inet_listen(struct socke
 done:
 	sdp_conn_unlock(conn);
 	return result;
-} /* _sdp_inet_listen */
+}
 
 /*
  * _sdp_inet_accept - accept a new socket from a listen socket
@@ -911,7 +911,7 @@ listen_done:
 		     (NULL == accept_sk ? 0 : accept_conn->dst_port));
 
 	return result;
-} /* _sdp_inet_accept */
+}
 
 /*
  * _sdp_inet_getname - return a sockets address information
@@ -947,7 +947,7 @@ static int _sdp_inet_getname(struct sock
 	*size = sizeof(struct sockaddr_in);
 
 	return 0;
-} /* _sdp_inet_getname */
+}
 
 /*
  * _sdp_inet_poll - poll a socket for activity
@@ -1037,7 +1037,7 @@ static unsigned int _sdp_inet_poll(struc
 	
 
 	return mask;
-} /* _sdp_inet_poll */
+}
 
 /*
  * _sdp_inet_ioctl - serivce an ioctl request on a socket
@@ -1160,7 +1160,7 @@ static int _sdp_inet_ioctl(struct socket
 	}
 
 	return result;
-} /* _sdp_inet_ioctl */
+}
 
 /*
  * _sdp_inet_setopt - set a socket option
@@ -1227,7 +1227,7 @@ static int _sdp_inet_setopt(struct socke
 
 	sdp_conn_unlock(conn);
 	return result;
-} /* _sdp_inet_setopt */
+}
 
 /*
  * _sdp_inet_getopt - get a socket option
@@ -1289,7 +1289,7 @@ static int _sdp_inet_getopt(struct socke
 		return -EFAULT;
 
 	return 0;
-} /* _sdp_inet_getopt */
+}
 
 /*
  * _sdp_inet_shutdown - shutdown a socket
@@ -1380,7 +1380,7 @@ static int _sdp_inet_shutdown(struct soc
 
 	sdp_conn_unlock(conn);
 	return result;
-} /* _sdp_inet_shutdown */
+}
 
 /*
  * Primary socket initialization
@@ -1447,7 +1447,7 @@ static int _sdp_inet_create(struct socke
 #endif
 
 	return 0;
-} /* _sdp_inet_create */
+}
 
 /*
  * INET module initialization functions
@@ -1548,7 +1548,7 @@ error_advt:
 	(void)sdp_main_proc_cleanup();
 error_proc:
 	return result;		/* success */
-} /* sdp_init */
+}
 
 /*
  * sdp_exit - cleanup the sdp host module
@@ -1580,7 +1580,7 @@ static void __exit sdp_exit(void)
 	 * proc tables
 	 */
 	(void)sdp_main_proc_cleanup();
-} /* sdp_exit */
+}
 
 module_init(sdp_init);
 module_exit(sdp_exit);
Index: sdp_proto.h
===================================================================
--- sdp_proto.h	(revision 1906)
+++ sdp_proto.h	(working copy)
@@ -584,7 +584,7 @@ static inline int __sdp_inet_write_space
 		return ((SDP_INET_SEND_MARK < size || 1 < urg) ? size : 0);
 	else
 		return 0;
-} /* __sdp_inet_write_space */
+}
 
 /*
  * __sdp_inet_writable - return non-zero if socket is writable
@@ -596,7 +596,7 @@ static inline int __sdp_inet_writable(st
 			(conn->send_qud / 2)) ? 0 : 1;
 	else
 		return 0;
-} /* __sdp_inet_writable */
+}
 
 /*
  * __sdp_conn_stat_dump - dump stats to the log
@@ -619,7 +619,7 @@ static inline int __sdp_conn_stat_dump(s
 		}
 #endif
 	return 0;
-} /* __sdp_conn_stat_dump */
+}
 
 /*
  * __sdp_conn_state_dump - dump state information to the log
@@ -647,6 +647,6 @@ static inline int __sdp_conn_state_dump(
 			     conn->state_rec.line[counter]);
 #endif
 	return 0;
-} /* __sdp_conn_state_dump */
+}
 
 #endif /* _SDP_PROTO_H */
Index: sdp_read.c
===================================================================
--- sdp_read.c	(revision 1906)
+++ sdp_read.c	(working copy)
@@ -98,7 +98,7 @@ done:
 	return 0;
 error:
 	return result;
-} /* _sdp_event_read_advt */
+}
 
 /*
  * RDMA read QP Event Handler
@@ -282,4 +282,4 @@ int sdp_event_read(struct sdp_opt *conn,
 
 done:
 	return result;
-} /* sdp_event_read */
+}
Index: sdp_msgs.h
===================================================================
--- sdp_msgs.h	(revision 1906)
+++ sdp_msgs.h	(working copy)
@@ -284,7 +284,7 @@ static inline void __sdp_msg_swap_bsdh(s
 	header->size = cpu_to_be32(header->size);
 	header->seq_num = cpu_to_be32(header->seq_num);
 	header->seq_ack = cpu_to_be32(header->seq_ack);
-} /* __sdp_msg_swap_bsdh */
+}
 
 /*
  * __sdp_msg_swap_hh - SDP header endian byte swapping
@@ -302,7 +302,7 @@ static inline void __sdp_msg_swap_hh(str
 	header->dst.ipv6.addr1 = cpu_to_be32(header->dst.ipv6.addr1);
 	header->dst.ipv6.addr2 = cpu_to_be32(header->dst.ipv6.addr2);
 	header->dst.ipv6.addr3 = cpu_to_be32(header->dst.ipv6.addr3);
-} /* __sdp_msg_swap_ */
+}
 
 /*
  * __sdp_msg_swap_hah - SDP header endian byte swapping
@@ -310,7 +310,7 @@ static inline void __sdp_msg_swap_hh(str
 static inline void __sdp_msg_swap_hah(struct msg_hdr_hah *header)
 {
 	header->l_rcv_size = cpu_to_be32(header->l_rcv_size);
-} /* __sdp_msg_swap_hah */
+}
 
 /*
  * __sdp_msg_swap_srcah - SDP header endian byte swapping
@@ -325,7 +325,7 @@ static inline void __sdp_msg_swap_srcah(
 	header->r_key = cpu_to_be32(header->r_key);
 	header->addr = cpu_to_be64(header->addr);
 #endif
-} /* __sdp_msg_swap_srcah */
+}
 
 /*
  * __sdp_msg_swap_snkah - SDP header endian byte swapping
@@ -336,7 +336,7 @@ static inline void __sdp_msg_swap_snkah(
 	header->r_key = cpu_to_be32(header->r_key);
 	header->addr = cpu_to_be64(header->addr);
 	header->non_disc = cpu_to_be32(header->non_disc);
-} /* __sdp_msg_swap_snkah */
+}
 
 /*
  * __sdp_msg_swap_rwch - SDP header endian byte swapping
@@ -344,7 +344,7 @@ static inline void __sdp_msg_swap_snkah(
 static inline void __sdp_msg_swap_rwch(struct msg_hdr_rwch *header)
 {
 	header->size = cpu_to_be32(header->size);
-} /* __sdp_msg_swap_rwch */
+}
 
 /*
  * __sdp_msg_swap_rrch - SDP header endian byte swapping
@@ -352,7 +352,7 @@ static inline void __sdp_msg_swap_rwch(s
 static inline void __sdp_msg_swap_rrch(struct msg_hdr_rrch *header)
 {
 	header->size = cpu_to_be32(header->size);
-} /* __sdp_msg_swap_rrch */
+}
 
 /*
  * __sdp_msg_swap_mch - SDP header endian byte swapping
@@ -360,7 +360,7 @@ static inline void __sdp_msg_swap_rrch(s
 static inline void __sdp_msg_swap_mch(struct msg_hdr_mch *header)
 {
 	return;
-} /* __sdp_msg_swap_ */
+}
 
 /*
  * __sdp_msg_swap_crbh - SDP header endian byte swapping
@@ -368,7 +368,7 @@ static inline void __sdp_msg_swap_mch(st
 static inline void __sdp_msg_swap_crbh(struct msg_hdr_crbh *header)
 {
 	header->size = cpu_to_be32(header->size);
-} /* __sdp_msg_swap_crbh */
+}
 
 /*
  * __sdp_msg_swap_crbah - SDP header endian byte swapping
@@ -376,7 +376,7 @@ static inline void __sdp_msg_swap_crbh(s
 static inline void __sdp_msg_swap_crbah(struct msg_hdr_crbah *header)
 {
 	header->size = cpu_to_be32(header->size);
-} /* __sdp_msg_swap_crbah */
+}
 
 /*
  * __sdp_msg_swap_sch - SDP header endian byte swapping
@@ -384,7 +384,7 @@ static inline void __sdp_msg_swap_crbah(
 static inline void __sdp_msg_swap_sch(struct msg_hdr_sch *header)
 {
 	header->service_id = cpu_to_be64(header->service_id);
-} /* __sdp_msg_swap_sch */
+}
 
 #define _sdp_msg_cpu_to_net_bsdh  __sdp_msg_swap_bsdh
 #define _sdp_msg_net_to_cpu_bsdh  __sdp_msg_swap_bsdh
Index: sdp_send.c
===================================================================
--- sdp_send.c	(revision 1906)
+++ sdp_send.c	(working copy)
@@ -176,7 +176,7 @@ done:
 	conn->send_seq--;
 	conn->s_wq_size--;
 	return result;
-} /* _sdp_send_buff_post */
+}
 
 /*
  * DATA functions
@@ -291,7 +291,7 @@ static int _sdp_send_data_buff_post(stru
 	return 0;
 error:
 	return result;
-} /* _sdp_send_data_buff_post */
+}
 
 /*
  * _sdp_send_data_buff_snk - Post data for buffered transmission
@@ -428,7 +428,7 @@ static int _sdp_send_data_buff_snk(struc
 	return 0;
 error:
 	return result;
-} /* _sdp_send_data_buff_snk */
+}
 
 /*
  * _sdp_send_data_iocb_snk - process a zcopy write advert in the data path
@@ -554,7 +554,7 @@ static int _sdp_send_data_iocb_snk(struc
 	return iocb->len;
 error:
 	return result;
-} /* _sdp_send_data_iocb_snk */
+}
 
 /*
  * _sdp_send_data_iocb_src - send a zcopy read advert in the data path
@@ -719,7 +719,7 @@ error:
 drop:
 	(void)sdp_buff_pool_put(buff);
 	return result;
-} /* _sdp_send_data_iocb_src */
+}
 
 /*
  * _sdp_send_iocb_buff_write - write part of an iocb into a SDP buffer
@@ -767,7 +767,7 @@ static int _sdp_send_iocb_buff_write(str
 	}
 
 	return 0;
-} /* _sdp_send_iocb_buff_write */
+}
 
 /*
  * _sdp_send_data_iocb_buff - write multiple SDP buffers from an iocb
@@ -841,7 +841,7 @@ drop:
 	(void)sdp_buff_pool_put(buff);
 error:
 	return result;
-} /* _sdp_send_data_iocb_buff */
+}
 
 /*
  * _sdp_send_data_iocb - Post IOCB data for transmission
@@ -931,7 +931,7 @@ static int _sdp_send_data_iocb(struct sd
 
 done:
 	return result;
-} /* _sdp_send_data_iocb */
+}
 
 /*
  * _sdp_send_data_queue_test - send data buffer if conditions are met
@@ -962,7 +962,7 @@ static int _sdp_send_data_queue_test(str
 						 (struct sdpc_buff *)element);
 
 	return result;
-} /* _sdp_send_data_queue_test */
+}
 
 /*
  * _sdp_send_data_queue_flush - Flush data from send queue, to send post
@@ -1004,7 +1004,7 @@ static int _sdp_send_data_queue_flush(st
 	}
 
 	return result;
-} /* _sdp_send_data_queue_flush */
+}
 
 /*
  * _sdp_send_data_queue - send using the data queue if necessary
@@ -1055,7 +1055,7 @@ static int _sdp_send_data_queue(struct s
 	return 0;
 done:
 	return result;
-} /* _sdp_send_data_queue */
+}
 
 /*
  * _sdp_send_data_buff_get - get an appropriate write buffer for send
@@ -1080,7 +1080,7 @@ static inline struct sdpc_buff *_sdp_sen
 	}
 
 	return buff;
-} /* _sdp_send_data_buff_get */
+}
 
 /*
  * _sdp_send_data_buff_put - place a buffer into the send queue
@@ -1134,7 +1134,7 @@ static inline int _sdp_send_data_buff_pu
 	}
 
 	return result;
-} /* _sdp_send_data_buff_put */
+}
 
 /*
  * CONTROL functions
@@ -1165,7 +1165,7 @@ static int _sdp_send_ctrl_buff_test(stru
 	return 0;
 error:
 	return result;
-} /* _sdp_send_ctrl_buff_test */
+}
 
 /*
  * _sdp_send_ctrl_buff_flush - Flush control buffers, to send post
@@ -1202,7 +1202,7 @@ static int _sdp_send_ctrl_buff_flush(str
 	}
 
 	return result;
-} /* _sdp_send_ctrl_buff_flush */
+}
 
 /*
  * _sdp_send_ctrl_buff_buffered - Send a buffered control message
@@ -1238,7 +1238,7 @@ static int _sdp_send_ctrl_buff_buffered(
 	return 0;
 error:
 	return result;
-} /* _sdp_send_ctrl_buff_buffered */
+}
 
 /*
  * _sdp_send_ctrl_buff - Create and Send a buffered control message
@@ -1295,7 +1295,7 @@ static int _sdp_send_ctrl_buff(struct sd
 
 error:
 	return result;
-} /* _sdp_send_ctrl_buff */
+}
 
 /*
  * _sdp_send_ctrl_disconnect - Send a disconnect request
@@ -1344,7 +1344,7 @@ static int _sdp_send_ctrl_disconnect(str
 	return 0;
 error:
 	return result;
-} /* _sdp_send_ctrl_disconnect */
+}
 
 /*
  * sdp_send_ctrl_disconnect - potentially send a disconnect request
@@ -1375,7 +1375,7 @@ int sdp_send_ctrl_disconnect(struct sdp_
 	} else
 		result = -EPROTO;
 	return result;
-} /* sdp_send_ctrl_disconnect */
+}
 
 /*
  * sdp_send_ctrl_ack - Send a gratuitous Ack
@@ -1397,7 +1397,7 @@ int sdp_send_ctrl_ack(struct sdp_opt *co
 		return 0;
 
 	return _sdp_send_ctrl_buff(conn, SDP_MID_DATA, 0, 0);
-} /* sdp_send_ctrl_ack */
+}
 
 /*
  * sdp_send_ctrl_send_sm - Send a request for buffered mode
@@ -1405,7 +1405,7 @@ int sdp_send_ctrl_ack(struct sdp_opt *co
 int sdp_send_ctrl_send_sm(struct sdp_opt *conn)
 {
 	return _sdp_send_ctrl_buff(conn, SDP_MID_SEND_SM, 1, 1);
-} /* sdp_send_ctrl_send_sm */
+}
 
 /*
  * sdp_send_ctrl_src_cancel - Send a source cancel
@@ -1413,7 +1413,7 @@ int sdp_send_ctrl_send_sm(struct sdp_opt
 int sdp_send_ctrl_src_cancel(struct sdp_opt *conn)
 {
 	return _sdp_send_ctrl_buff(conn, SDP_MID_SRC_CANCEL, 1, 1);
-} /* sdp_send_ctrl_src_cancel */
+}
 
 /*
  * sdp_send_ctrl_snk_cancel - Send a sink cancel
@@ -1421,7 +1421,7 @@ int sdp_send_ctrl_src_cancel(struct sdp_
 int sdp_send_ctrl_snk_cancel(struct sdp_opt *conn)
 {
 	return _sdp_send_ctrl_buff(conn, SDP_MID_SNK_CANCEL, 1, 1);
-} /* sdp_send_ctrl_snk_cancel */
+}
 
 /*
  * sdp_send_ctrl_snk_cancel_ack - Send an ack for a sink cancel
@@ -1429,7 +1429,7 @@ int sdp_send_ctrl_snk_cancel(struct sdp_
 int sdp_send_ctrl_snk_cancel_ack(struct sdp_opt *conn)
 {
 	return _sdp_send_ctrl_buff(conn, SDP_MID_SNK_CANCEL_ACK, 1, 1);
-} /* sdp_send_ctrl_snk_cancel_ack */
+}
 
 /*
  * sdp_send_ctrl_abort - Send an abort message
@@ -1440,7 +1440,7 @@ int sdp_send_ctrl_abort(struct sdp_opt *
 	 * send
 	 */
 	return _sdp_send_ctrl_buff(conn, SDP_MID_ABORT_CONN, 1, 1);
-} /* sdp_send_ctrl_abort */
+}
 
 /*
  * sdp_send_ctrl_resize_buff_ack - Send an ack for a buffer size change
@@ -1491,7 +1491,7 @@ int sdp_send_ctrl_resize_buff_ack(struct
 
 error:
 	return result;
-} /* sdp_send_ctrl_resize_buff_ack */
+}
 
 /*
  * sdp_send_ctrl_rdma_rd - Send an rdma read completion
@@ -1560,7 +1560,7 @@ int sdp_send_ctrl_rdma_rd(struct sdp_opt
 
 error:
 	return result;
-} /* sdp_send_ctrl_rdma_rd */
+}
 
 /*
  * sdp_send_ctrl_rdma_wr - Send an rdma write completion
@@ -1617,7 +1617,7 @@ int sdp_send_ctrl_rdma_wr(struct sdp_opt
 
 error:
 	return result;
-} /* sdp_send_ctrl_rdma_wr */
+}
 
 /*
  * sdp_send_ctrl_snk_avail - Send a sink available message
@@ -1683,7 +1683,7 @@ int sdp_send_ctrl_snk_avail(struct sdp_o
 	result = 0;
 error:
 	return result;
-} /* sdp_send_ctrl_snk_avail */
+}
 
 /*
  * sdp_send_ctrl_mode_ch - Send a mode change command
@@ -1768,7 +1768,7 @@ int sdp_send_ctrl_mode_ch(struct sdp_opt
 
 error:
 	return result;
-} /* sdp_send_ctrl_mode_ch */
+}
 
 /*
  * GENERAL functions
@@ -1786,7 +1786,7 @@ static int _sdp_write_src_lookup(struct 
 		return 0;
 	else
 		return -ERANGE;
-} /* _sdp_write_src_lookup */
+}
 
 /*
  * _sdp_inet_write_cancel - cancel an IO operation
@@ -1928,7 +1928,7 @@ done:
 
 	aio_put_req(req); /* cancel call reference */
 	return result;
-} /* _sdp_inet_write_cancel */
+}
 
 /*
  * _sdp_send_flush_advt - Flush passive sink advertisments
@@ -1967,7 +1967,7 @@ static int _sdp_send_flush_advt(struct s
 	}
 
 	return 0;
-} /* _sdp_send_flush_advt */
+}
 
 /*
  * sdp_send_flush - Flush buffers from send queue, in to send post
@@ -2025,7 +2025,7 @@ int sdp_send_flush(struct sdp_opt *conn)
 	return 0;
 done:
 	return result;
-} /* sdp_send_flush */
+}
 
 /*
  * sdp_inet_send - send data from user space to the network
@@ -2253,4 +2253,4 @@ done:
 		send_sig(SIGPIPE, current, 0);
 
 	return result;
-} /* sdp_inet_send */
+}
Index: sdp_actv.c
===================================================================
--- sdp_actv.c	(revision 1906)
+++ sdp_actv.c	(working copy)
@@ -182,7 +182,7 @@ drop:
 
 	sdp_conn_put(conn);	/* CM sk reference */
 	return result;
-} /* _sdp_actv_conn_establish */
+}
 
 /*
  * _sdp_cm_hello_ack_check - validate the hello ack header
@@ -236,7 +236,7 @@ static int _sdp_cm_hello_ack_check(struc
 		     hello_ack->hah.l_rcv_size);
 
 	return 0; /* success */
-} /* _sdp_cm_hello_ack_check */
+}
 
 /*
  * sdp_cm_rep_handler - handler for active connection open completion
@@ -340,7 +340,7 @@ reject:
 done:
 	conn->cm_id = NULL;
 	return error;
-} /* sdp_cm_rep_handler */
+}
 
 /*
  * _sdp_cm_path_complete - path lookup complete, initiate SDP connection
@@ -537,7 +537,7 @@ done:
 	sdp_conn_put(conn);
 
 	return;
-} /* _sdp_cm_path_complete */
+}
 
 /*
  * sdp_cm_connect - initiate a SDP connection with a hello message.
@@ -588,4 +588,4 @@ int sdp_cm_connect(struct sdp_opt *conn)
 	return 0;
 error:
 	return result;
-} /* sdp_cm_connect */
+}
Index: sdp_conn.c
===================================================================
--- sdp_conn.c	(revision 1906)
+++ sdp_conn.c	(working copy)
@@ -71,7 +71,7 @@ static u32 _sdp_psn_generate(void)
         spin_unlock(&psn_lock);
 
         return psn;
-} /* sdp_psn_generate */
+}
 
 /*
  * sdp_inet_accept_q_put - put a conn into a listen conn's accept Q.
@@ -102,7 +102,7 @@ int sdp_inet_accept_q_put(struct sdp_opt
 	sdp_conn_hold(accept_conn);	/* INET reference */
 
 	return 0;
-} /* sdp_inet_accept_q_put */
+}
 
 /*
  * sdp_inet_accept_q_get - get a conn from a listen conn's accept Q.
@@ -141,7 +141,7 @@ struct sdp_opt *sdp_inet_accept_q_get(st
 	listen_conn->backlog_cnt--;
 
 	return accept_conn;
-} /* sdp_inet_accept_q_get */
+}
 
 /*
  * sdp_inet_accept_q_remove - remove a conn from a conn's accept Q.
@@ -176,7 +176,7 @@ int sdp_inet_accept_q_remove(struct sdp_
 	accept_conn->parent = NULL;
 
 	return 0;
-} /* sdp_inet_accept_q_remove */
+}
 
 /*
  * sdp_inet_listen_start - start listening for new connections on a socket
@@ -209,7 +209,7 @@ int sdp_inet_listen_start(struct sdp_opt
 
 	spin_unlock_irqrestore(&_dev_root_s.listen_lock, flags);
 	return 0;
-} /* sdp_inet_listen_start */
+}
 
 /*
  * sdp_inet_listen_stop - stop listening for new connections on a socket
@@ -269,7 +269,7 @@ int sdp_inet_listen_stop(struct sdp_opt 
 	listen_conn->accept_prev = NULL;
 
 	return 0;
-} /* sdp_inet_listen_stop */
+}
 
 /*
  * sdp_inet_listen_lookup - lookup a connection in the listen list
@@ -295,7 +295,7 @@ struct sdp_opt *sdp_inet_listen_lookup(u
 
 	spin_unlock_irqrestore(&_dev_root_s.listen_lock, flags);
 	return conn;
-} /* sdp_inet_listen_lookup */
+}
 
 /*
  * sdp_inet_port_get - bind a socket to a port.
@@ -417,7 +417,7 @@ int sdp_inet_port_get(struct sdp_opt *co
 done:
 	spin_unlock_irqrestore(&_dev_root_s.bind_lock, flags);
 	return result;
-} /* sdp_inet_port_get */
+}
 
 /*
  * sdp_inet_port_put - unbind a socket from a port.
@@ -446,7 +446,7 @@ int sdp_inet_port_put(struct sdp_opt *co
 
 	spin_unlock_irqrestore(&_dev_root_s.bind_lock, flags);
 	return 0;
-} /* sdp_inet_port_put */
+}
 
 /*
  * sdp_inet_port_inherit - inherit a port from another socket (accept)
@@ -482,7 +482,7 @@ int sdp_inet_port_inherit(struct sdp_opt
 done:
 	spin_unlock_irqrestore(&_dev_root_s.bind_lock, flags);
 	return result;
-} /* sdp_inet_port_inherit */
+}
 
 /*
  * _sdp_conn_table_insert - insert a connection into the connection table
@@ -526,7 +526,7 @@ static int _sdp_conn_table_insert(struct
 	 */
 	spin_unlock_irqrestore(&_dev_root_s.sock_lock, flags);
 	return result;
-} /* _sdp_conn_table_insert */
+}
 
 /*
  * sdp_conn_table_remove - remove a connection from the connection table
@@ -563,7 +563,7 @@ done:
 	 */
 	spin_unlock_irqrestore(&_dev_root_s.sock_lock, flags);
 	return result;
-} /* sdp_conn_table_remove */
+}
 
 /*
  * sdp_conn_table_lookup - look up connection in the connection table
@@ -595,7 +595,7 @@ struct sdp_opt *sdp_conn_table_lookup(s3
 done:
 	spin_unlock_irqrestore(&_dev_root_s.sock_lock, flags);
 	return conn;
-} /* sdp_conn_table_lookup */
+}
 
 /* 
  * Functions to cancel IOCB requests in a conenctions queues.
@@ -782,7 +782,7 @@ done:
 	}
 
 	return result;
-} /* _sdp_conn_destruct */
+}
 
 /*
  * sdp_conn_internal_lock - lock the connection (use only from macro)
@@ -808,7 +808,7 @@ void sdp_conn_internal_lock(struct sdp_o
 	remove_wait_queue(&(conn->lock.waitq), &wait);
 
 	return;
-} /* sdp_conn_internal_lock */
+}
 
 /*
  * sdp_conn_relock - test the connection (use only from macro)
@@ -873,7 +873,7 @@ void sdp_conn_relock(struct sdp_opt *con
 
 	spin_unlock_irqrestore(&conn->lock.slock, flags);
 	return;
-} /* sdp_conn_relock */
+}
 
 /*
  * sdp_conn_cq_drain - drain one of the the connection's CQs
@@ -925,7 +925,7 @@ int sdp_conn_cq_drain(struct ib_cq *cq, 
 	}
 
 return calls;
-} /* sdp_conn_cq_drain */
+}
 
 /*
  * sdp_conn_internal_unlock - lock the connection (use only from macro)
@@ -947,7 +947,7 @@ void sdp_conn_internal_unlock(struct sdp
 	}
 
 	return;
-} /* sdp_conn_internal_unlock */
+}
 
 /*
  * _sdp_conn_lock_init - initialize connection lock
@@ -957,7 +957,7 @@ static void _sdp_conn_lock_init(struct s
 	spin_lock_init(&(conn->lock.slock));
 	conn->lock.users = 0;
 	init_waitqueue_head(&(conn->lock.waitq));
-} /* _sdp_conn_lock_init */
+}
 
 /*
  * sdp_conn_alloc_ib - allocate IB structures for a new connection.
@@ -1136,7 +1136,7 @@ error_param:
 	kfree(qp_attr);
 error_attr:
 	return result;
-} /* sdp_conn_alloc_ib  */
+}
 
 /*
  * sdp_conn_alloc - allocate a new socket, and init.
@@ -1330,7 +1330,7 @@ error_conn:
 error:
 	sk_free(sk);
 	return NULL;
-} /* sdp_conn_alloc  */
+}
 
 /*
  * module public functions
@@ -1439,7 +1439,7 @@ int sdp_proc_dump_conn_main(char *buffer
 done:
 	spin_unlock_irqrestore(&_dev_root_s.sock_lock, flags);
 	return offset;
-} /* sdp_proc_dump_conn_main */
+}
 
 #define SDP_CONN_PROC_DATA_SIZE  176 /* output line size. */
 #define SDP_PROC_CONN_DATA_HEAD \
@@ -1542,7 +1542,7 @@ int sdp_proc_dump_conn_data(char *buffer
 done:
 	spin_unlock_irqrestore(&_dev_root_s.sock_lock, flags);
 	return offset;
-} /* sdp_proc_dump_conn_data */
+}
 
 #define SDP_CONN_PROC_RDMA_SIZE   98 /* output line size. */
 #define SDP_PROC_CONN_RDMA_HEAD \
@@ -1624,7 +1624,7 @@ int sdp_proc_dump_conn_rdma(char *buffer
 done:
 	spin_unlock_irqrestore(&_dev_root_s.sock_lock, flags);
 	return offset;
-} /* sdp_proc_dump_conn_rdma */
+}
 
 #define SDP_SOPT_PROC_DUMP_SIZE   55 /* output line size. */
 #define SDP_PROC_CONN_SOPT_HEAD \
@@ -1695,7 +1695,7 @@ int sdp_proc_dump_conn_sopt(char *buffer
 done:
 	spin_unlock_irqrestore(&_dev_root_s.sock_lock, flags);
 	return offset;
-} /* sdp_proc_dump_conn_sopt */
+}
 
 /*
  * sdp_proc_dump_device - dump the primary device table to /proc
@@ -1740,7 +1740,7 @@ int sdp_proc_dump_device(char *buffer,
 	}
 
 	return offset;
-} /* sdp_proc_dump_device */
+}
 
 /*
  * initialization/cleanup functions
@@ -1874,7 +1874,7 @@ error:
 		(void)ib_dealloc_pd(hca->pd);
 
 	kfree(hca);
-} /* sdp_device_init_one */
+}
 
 /*
  * sdp_device_remove_one - remove a device from the hca list
@@ -1910,7 +1910,7 @@ static void sdp_device_remove_one(struct
 		(void)ib_dealloc_pd(hca->pd);
 
 	kfree(hca);
-} /* sdp_device_remove_one */
+}
 
 /*
  * sdp_conn_table_init - create a sdp connection table
@@ -2044,7 +2044,7 @@ error_size:
 	ib_unregister_client(&sdp_client);
 error_hca:
 	return result;
-} /* sdp_conn_table_init */
+}
 
 /*
  * sdp_conn_table_clear - destroy connection managment and tables
@@ -2088,4 +2088,4 @@ int sdp_conn_table_clear(void)
 	sdp_main_iocb_cleanup();
 
 	return 0;
-} /* sdp_conn_table_clear */
+}
Index: sdp_advt.c
===================================================================
--- sdp_advt.c	(revision 1906)
+++ sdp_advt.c	(working copy)
@@ -65,7 +65,7 @@ struct sdpc_advt *sdp_advt_create(void)
 	}
 
 	return advt;
-} /* sdp_advt_create */
+}
 
 /*
  * sdp_advt_destroy - destroy an advertisment object
@@ -80,7 +80,7 @@ int sdp_advt_destroy(struct sdpc_advt *a
 	kmem_cache_free(__sdp_advt_cache, advt);
 
 	return 0;
-} /* sdp_advt_destroy */
+}
 
 /*
  * sdp_advt_q_get - get, and remove, the object at the tables head
@@ -112,7 +112,7 @@ struct sdpc_advt *sdp_advt_q_get(struct 
 	advt->prev = NULL;
 
 	return advt;
-} /* sdp_advt_q_get */
+}
 
 /*
  * sdp_advt_q_look - get, without removing, the object at the head
@@ -120,7 +120,7 @@ struct sdpc_advt *sdp_advt_q_get(struct 
 struct sdpc_advt *sdp_advt_q_look(struct sdpc_advt_q *table)
 {
 	return table->head;
-} /* sdp_advt_q_look */
+}
 
 /*
  * sdp_advt_q_put - put the advertisment object at the tables tail
@@ -146,7 +146,7 @@ void sdp_advt_q_put(struct sdpc_advt_q *
 	}
 
 	table->size++;
-} /* sdp_advt_q_put */
+}
 
 /*
  * sdp_advt_q_init - initialize a new empty advertisment table
@@ -155,7 +155,7 @@ void sdp_advt_q_init(struct sdpc_advt_q 
 {
 	table->head = NULL;
 	table->size = 0;
-} /* sdp_advt_q_init */
+}
 
 /*
  * sdp_advt_q_clear - clear the contents of an advertisment table
@@ -172,7 +172,7 @@ void sdp_advt_q_clear(struct sdpc_advt_q
 		result = sdp_advt_destroy(advt);
 		SDP_EXPECT(!(0 > result));
 	}
-} /* sdp_advt_q_clear */
+}
 
 /*
  * primary initialization/cleanup functions
@@ -200,7 +200,7 @@ int sdp_main_advt_init(void)
 		return -ENOMEM;
 
 	return 0;
-} /* sdp_main_advt_init */
+}
 
 /*
  * sdp_main_advt_cleanup - cleanup the advertisment caches.
@@ -216,4 +216,4 @@ void sdp_main_advt_cleanup(void)
 	 * null out entries.
 	 */
 	__sdp_advt_cache = NULL;
-} /* sdp_main_advt_cleanup */
+}
Index: sdp_recv.c
===================================================================
--- sdp_recv.c	(revision 1906)
+++ sdp_recv.c	(working copy)
@@ -110,7 +110,7 @@ drop:
 	conn->l_recv_bf--;
 error:
 	return result;
-} /* _sdp_post_recv_buff */
+}
 
 /*
  * _sdp_post_rdma_buff - post a single buffers for rdma read on a conn
@@ -217,7 +217,7 @@ drop:
 error:
 done:
 	return result;
-} /* _sdp_post_rdma_buff */
+}
 
 /*
  * _sdp_post_rdma_iocb_src - post a iocb for rdma read on a conn
@@ -348,7 +348,7 @@ static int _sdp_post_rdma_iocb_src(struc
 error:
 done:
 	return result;
-} /* _sdp_post_rdma_iocb_src */
+}
 
 /*
  * _sdp_post_rdma_iocb_snk - post a iocb for rdma read on a conn
@@ -447,7 +447,7 @@ release:
 	(void)sdp_iocb_release(iocb);
 error:
 	return result;
-} /* _sdp_post_rdma_iocb_snk */
+}
 
 /*
  * _sdp_post_rdma - post a rdma based requests for a connection
@@ -526,7 +526,7 @@ static int _sdp_post_rdma(struct sdp_opt
 	result = 0;
 done:
 	return result;
-} /* _sdp_post_rdma */
+}
 
 /*
  * sdp_recv_flush - post a certain number of buffers on a connection
@@ -625,7 +625,7 @@ int sdp_recv_flush(struct sdp_opt *conn)
 	result = 0;
 done:
 	return result;
-} /* sdp_recv_flush */
+}
 
 /*
  * Receive incoming data function(s)
@@ -691,7 +691,7 @@ static int _sdp_read_buff_iocb(struct sd
 	buff->tail = tail;
 
 	return 0;
-} /* _sdp_read_buff_iocb */
+}
 
 /*
  * _sdp_recv_buff_iocb_active - Ease AIO read pending pressure
@@ -740,7 +740,7 @@ static int _sdp_recv_buff_iocb_active(st
 			     result, iocb->key);
 
 	return (buff->tail - buff->data);
-} /* _sdp_recv_buff_iocb_active */
+}
 
 /*
  * _sdp_recv_buff_iocb_pending - Ease AIO read pending pressure
@@ -800,7 +800,7 @@ static int _sdp_recv_buff_iocb_pending(s
 	}
 
 	return (buff->tail - buff->data);
-} /* _sdp_recv_buff_iocb_pending */
+}
 
 /*
  * sdp_recv_buff - Process a new buffer based on queue type
@@ -892,7 +892,7 @@ int sdp_recv_buff(struct sdp_opt *conn, 
 	return buffered;
 done:
 	return result;
-} /* sdp_recv_buff */
+}
 
 /*
  * User initiated receive data function(s)
@@ -910,7 +910,7 @@ static int _sdp_read_src_lookup(struct s
 		return 0;
 	else
 		return -ERANGE;
-} /* _sdp_read_src_lookup */
+}
 
 /*
  * _sdp_inet_read_cancel - cancel an IO operation
@@ -1042,7 +1042,7 @@ unlock:
 done:
 	aio_put_req(req);
 	return result;
-} /* _sdp_inet_read_cancel */
+}
 
 /*
  * _sdp_inet_recv_urg_test - recv queue urgent data cleanup function
@@ -1050,7 +1050,7 @@ done:
 static int _sdp_inet_recv_urg_test(struct sdpc_buff *buff, void *arg)
 {
 	return ((buff->tail == buff->head) ? 1 : 0);
-} /* _sdp_inet_recv_urg_test */
+}
 
 /*
  * _sdp_inet_recv_urg_trav - recv queue urg data retreival function
@@ -1075,7 +1075,7 @@ static int _sdp_inet_recv_urg_trav(struc
 	}
 
 	return 0;
-} /* _sdp_inet_recv_urg_trav */
+}
 
 /*
  * _sdp_inet_recv_urg - recv urgent data from the network to user space
@@ -1150,7 +1150,7 @@ static int _sdp_inet_recv_urg(struct soc
 
 done:
 	return result;
-} /* _sdp_inet_recv_urg */
+}
 
 /*
  * sdp_inet_recv - recv data from the network to user space
@@ -1268,10 +1268,10 @@ int sdp_inet_recv(struct kiocb  *req,
 							    (0 <
 							     (MSG_PEEK & flags))
 							    ? 0 : 1;
-						} /* if (OOB) */
-					} /* else (copied) */
-				} /* else (sitting on URG byte) */
-			} /* if (urgent present) */
+						}
+					}
+				}
+			}
 
 			copy = min((size_t) (size - copied), length);
 
@@ -1523,4 +1523,4 @@ done:
 
 	sdp_conn_unlock(conn);
 	return ((0 < copied) ? copied : result);
-} /* sdp_inet_recv */
+}
Index: sdp_wall.c
===================================================================
--- sdp_wall.c	(revision 1906)
+++ sdp_wall.c	(working copy)
@@ -112,7 +112,7 @@ error:
 		sdp_dbg_warn(conn, "Error <%d> CM disconnect send", result);
 
 	return result;
-} /* sdp_wall_send_close */
+}
 
 /*
  * sdp_wall_send_closing - callback to confirm a passive close
@@ -164,7 +164,7 @@ error:
 		sdp_dbg_warn(conn, "Error <%d> CM disconnect send", result);
 
 	return result;
-} /* sdp_wall_send_closing */
+}
 
 /*
  * sdp_wall_send_abort - callback to accept an active abort
@@ -270,7 +270,7 @@ error:
 		sdp_dbg_warn(conn, "Error <%d> CM disconnect send", result);
 
 	return 0;
-} /* sdp_wall_send_abort */
+}
 
 /*
  * SDP INET (public functions)
@@ -300,7 +300,7 @@ int sdp_wall_recv_reject(struct sdp_opt 
 	sdp_conn_put(conn);	/* CM reference */
 
 	return 0;
-} /* sdp_wall_recv_reject */
+}
 
 /*
  * sdp_wall_recv_confirm - callback to confirm accepeted passive open
@@ -364,7 +364,7 @@ error:
 	sdp_conn_put(conn);	/* CM sk reference */
 	
 	return result;
-} /* sdp_wall_recv_confirm */
+}
 
 /*
  * sdp_wall_recv_failed - callback to notify accepted open of a failure
@@ -397,7 +397,7 @@ int sdp_wall_recv_failed(struct sdp_opt 
 	sdp_conn_put(conn);	/* CM reference */
 
 	return 0;
-} /* sdp_wall_recv_failed */
+}
 
 /*
  * sdp_wall_recv_close - callback to accept an active close
@@ -438,7 +438,7 @@ int sdp_wall_recv_close(struct sdp_opt *
 	}
 
 	return 0;
-} /* sdp_wall_recv_close */
+}
 
 /*
  * sdp_wall_recv_closing - callback for a close confirmation
@@ -468,7 +468,7 @@ int sdp_wall_recv_closing(struct sdp_opt
 	sk_wake_async(conn->sk, 1, POLL_HUP);
 
 	return 0;
-} /* sdp_wall_recv_closing */
+}
 
 /*
  * sdp_wall_recv_abort - abortive close notification
@@ -508,7 +508,7 @@ int sdp_wall_recv_abort(struct sdp_opt *
 	sdp_inet_wake_error(conn->sk);
 
 	return 0;
-} /* sdp_wall_recv_abort */
+}
 
 /*
  * sdp_wall_recv_drop - drop SDP protocol reference to socket
@@ -569,7 +569,7 @@ int sdp_wall_recv_drop(struct sdp_opt *c
 	sdp_conn_put(conn);	/* CM sk reference */
 
 	return 0;
-} /* sdp_wall_recv_drop */
+}
 
 /*
  * SDP common (public functions)
@@ -594,4 +594,4 @@ int sdp_wall_abort(struct sdp_opt *conn)
 		sdp_dbg_warn(conn, "Error <%d> sending abort request", result);
 
 	return 0;
-} /* sdp_wall_abort */
+}
Index: sdp_proc.c
===================================================================
--- sdp_proc.c	(revision 1906)
+++ sdp_proc.c	(working copy)
@@ -74,7 +74,7 @@ static int _sdp_proc_read_parse(char *pa
 	}
 
 	return size;
-} /* _sdp_proc_read_parse */
+}
 
 /*
  * Static read/write functions for each proc/framework directory entry
@@ -155,7 +155,7 @@ int sdp_main_proc_cleanup(void)
 	sdp_dbg_init("/proc filesystem cleanup complete.");
 
 	return 0;
-} /* sdp_main_proc_cleanup */
+}
 
 /*
  * sdp_main_proc_init - initialize the proc filesystem entries
@@ -219,4 +219,4 @@ int sdp_main_proc_init(void)
 error:
 	(void)sdp_main_proc_cleanup();
 	return result;
-} /* sdp_main_proc_init */
+}
Index: sdp_pass.c
===================================================================
--- sdp_pass.c	(revision 1906)
+++ sdp_pass.c	(working copy)
@@ -178,7 +178,7 @@ static int _sdp_cm_accept(struct sdp_opt
 	return 0;
 error:
 	return result;
-} /* _sdp_cm_accept */
+}
 
 /*
  * _sdp_cm_listen_lookup - match a listener with an incomming conn
@@ -294,7 +294,7 @@ locked_err:
 	sdp_conn_put(listen_conn);	/* ListenLookup reference. */
 lookup_err:
 	return result;
-} /* _sdp_cm_listen_lookup */
+}
 
 /*
  * _sdp_cm_hello_check - validate the hello header
@@ -363,7 +363,7 @@ static int _sdp_cm_hello_check(struct sd
 		     msg_hello->hh.dst.ipv4.addr);
 	
 	return 0; /* success */
-} /* _sdp_cm_hello_check */
+}
 
 /*
  * sdp_cm_req_handler - handler for passive connection open completion
@@ -474,4 +474,4 @@ error:
 	sdp_conn_put(conn);	/* CM sk reference, will destory */
 done:
 	return result;
-} /* sdp_cm_req_handler */
+}
Index: sdp_sent.c
===================================================================
--- sdp_sent.c	(revision 1906)
+++ sdp_sent.c	(working copy)
@@ -113,7 +113,7 @@ static int _sdp_sent_disconnect(struct s
 	return 0;
 error:
 	return result;
-} /* _sdp_sent_disconnect */
+}
 
 static int _sdp_sent_abort(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -131,12 +131,12 @@ static int _sdp_sent_abort(struct sdp_op
 		sdp_dbg_warn(conn, "Error <%d> CM disconnect", result);
 
 	return result;
-} /* _sdp_sent_abort */
+}
 
 static int _sdp_sent_send_sm(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
 	return 0;
-} /* _sdp_sent_send_sm */
+}
 
 static int _sdp_sent_rdma_wr(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -148,7 +148,7 @@ static int _sdp_sent_rdma_wr(struct sdp_
 	_sdp_msg_net_to_cpu_rwch(rwch);
 
 	return 0;
-} /* _sdp_sent_rdma_wr */
+}
 
 static int _sdp_sent_rdma_rd(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -160,7 +160,7 @@ static int _sdp_sent_rdma_rd(struct sdp_
 	_sdp_msg_net_to_cpu_rrch(rrch);
 
 	return 0;
-} /* _sdp_sent_rdma_rd */
+}
 
 static int _sdp_sent_mode_change(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -172,23 +172,23 @@ static int _sdp_sent_mode_change(struct 
 	_sdp_msg_net_to_cpu_mch(mch);
 
 	return 0;
-} /* _sdp_sent_mode_change */
+}
 
 static int _sdp_sent_src_cancel(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
 	return 0;
-} /* _sdp_sent_src_cancel */
+}
 
 static int _sdp_sent_snk_cancel(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
 	return 0;
-} /* _sdp_sent_snk_cancel */
+}
 
 static int _sdp_sent_snk_cancel_ack(struct sdp_opt *conn,
 				    struct sdpc_buff *buff)
 {
 	return 0;
-} /* _sdp_sent_snk_cancel_ack */
+}
 
 static int _sdp_sent_resize_buff_ack(struct sdp_opt *conn,
 				     struct sdpc_buff *buff)
@@ -201,7 +201,7 @@ static int _sdp_sent_resize_buff_ack(str
 	_sdp_msg_net_to_cpu_crbah(crbah);
 
 	return 0;
-} /* _sdp_sent_resize_buff_ack */
+}
 
 static int _sdp_sent_suspend(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -213,12 +213,12 @@ static int _sdp_sent_suspend(struct sdp_
 	_sdp_msg_net_to_cpu_sch(sch);
 
 	return 0;
-} /* _sdp_sent_suspend */
+}
 
 static int _sdp_sent_suspend_ack(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
 	return 0;
-} /* _sdp_sent_suspend_ack */
+}
 
 static int _sdp_sent_snk_avail(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -230,7 +230,7 @@ static int _sdp_sent_snk_avail(struct sd
 	_sdp_msg_net_to_cpu_snkah(snkah);
 
 	return 0;
-} /* _sdp_sent_snk_avail */
+}
 
 static int _sdp_sent_src_avail(struct sdp_opt *conn, struct sdpc_buff *buff)
 {
@@ -242,7 +242,7 @@ static int _sdp_sent_src_avail(struct sd
 	_sdp_msg_net_to_cpu_srcah(srcah);
 
 	return 0;
-} /* _sdp_sent_src_avail */
+}
 
 /*
  * _sdp_sent_data - SDP data message event received
@@ -254,7 +254,7 @@ static int _sdp_sent_data(struct sdp_opt
 	conn->send_qud -= buff->data_size;
 
 	return result;
-} /* _sdp_sent_data */
+}
 
 /*
  * _sdp_sent_unsupported - Valid messages we're not sending
@@ -270,7 +270,7 @@ static int _sdp_sent_unsupported(struct 
 		     buff->bsdh_hdr->mid);
 
 	return 0;
-} /* _sdp_sent_unsupported */
+}
 
 /*
  * Event Dispatch table. For performance a dispatch table is used to avoid
@@ -470,4 +470,4 @@ drop:
 	(void)sdp_buff_pool_chain_put(head, free_count);
 done:
 	return result;
-} /* sdp_event_send */
+}
Index: sdp_iocb.c
===================================================================
--- sdp_iocb.c	(revision 1906)
+++ sdp_iocb.c	(working copy)
@@ -92,7 +92,7 @@ static int _sdp_iocb_unlock(struct sdpc_
 	}
 
 	return 0;
-} /* _sdp_iocb_unlock */
+}
 
 /*
  * sdp_iocb_unlock - unlock the memory for an IOCB
@@ -127,7 +127,7 @@ int sdp_iocb_unlock(struct sdpc_iocb *io
 	iocb->flags &= ~SDP_IOCB_F_LOCKED;
 
 	return result;
-} /* sdp_iocb_unlock */
+}
 
 /*
  * _sdp_iocb_page_save - save page information for an IOCB
@@ -226,7 +226,7 @@ err_page:
 err_addr:
 
 	return result;
-} /* _sdp_iocb_page_save */
+}
 
 /*
  * sdp_iocb_lock - lock the memory for an IOCB
@@ -338,7 +338,7 @@ err_lock:
 	iocb->mm = NULL;
 
 	return result;
-} /* sdp_iocb_lock */
+}
 
 /*
  * IOCB memory locking init functions
@@ -393,7 +393,7 @@ err_close:
 	filp_close(kallsyms, NULL);
 done:
 	return ret;
-} /* _sdp_mem_lock_init */
+}
 
 /*
  * _sdp_mem_lock_cleanup - cleanup the memory locking tables
@@ -407,7 +407,7 @@ static int _sdp_mem_lock_cleanup(void)
 	_mlock_ptr = NULL;
 	
 	return 0;
-} /* _sdp_mem_lock_cleanup */
+}
 
 /*
  * IOCB memory registration functions
@@ -462,7 +462,7 @@ error:
 	iocb->io_addr = 0;
 
 	return result;
-} /* sdp_iocb_register */
+}
 
 /*
  * sdp_iocb_release - unregister an IOCBs memory
@@ -482,7 +482,7 @@ int sdp_iocb_release(struct sdpc_iocb *i
 	iocb->flags &= ~(SDP_IOCB_F_REG);
 
 	return 0;
-} /* sdp_iocb_release */
+}
 
 /*
  * _sdp_iocb_complete - complete an IOCB for real in thread context
@@ -527,7 +527,7 @@ static void _sdp_iocb_complete(void *arg
 		sdp_dbg_err("Error <%d> deleting IOCB <%d> of status <%Zu>",
 			    result, iocb->key, iocb->status);
 
-} /* _sdp_iocb_complete */
+}
 
 /*
  * sdp_iocb_complete - complete an IOCB
@@ -543,7 +543,7 @@ int sdp_iocb_complete(struct sdpc_iocb *
 		_sdp_iocb_complete(iocb);
 	
 	return 0;
-} /* sdp_iocb_complete */
+}
 
 /*
  * IOCB object managment
@@ -577,7 +577,7 @@ void sdp_iocb_q_remove(struct sdpc_iocb 
 	iocb->table = NULL;
 	iocb->next = NULL;
 	iocb->prev = NULL;
-} /* sdp_iocb_q_remove */
+}
 
 /*
  * sdp_iocb_q_lookup - find an iocb based on key, without removing
@@ -593,7 +593,7 @@ struct sdpc_iocb *sdp_iocb_q_lookup(stru
 			return iocb;
 
 	return NULL;
-} /* sdp_iocb_q_lookup */
+}
 
 /*
  * sdp_iocb_create - create an IOCB object
@@ -614,7 +614,7 @@ struct sdpc_iocb *sdp_iocb_create(void)
 	}
 
 	return iocb;
-} /* sdp_iocb_create */
+}
 
 /*
  * sdp_iocb_destroy - destroy an IOCB object
@@ -654,7 +654,7 @@ int sdp_iocb_destroy(struct sdpc_iocb *i
 	kmem_cache_free(__sdp_iocb_cache, iocb);
 
 	return 0;
-} /* sdp_iocb_destroy */
+}
 
 /*
  * sdp_iocb_q_look - get, without removing, the object at the head
@@ -662,7 +662,7 @@ int sdp_iocb_destroy(struct sdpc_iocb *i
 struct sdpc_iocb *sdp_iocb_q_look(struct sdpc_iocb_q *table)
 {
 	return table->head;
-} /* sdp_iocb_q_look */
+}
 
 /*
  * _sdp_iocb_q_get - get, and remove, the object at the tables head
@@ -699,7 +699,7 @@ static struct sdpc_iocb *_sdp_iocb_q_get
 	iocb->prev = NULL;
 
 	return iocb;
-} /* _sdp_iocb_q_get */
+}
 
 /*
  * _sdp_iocb_q_put - put the IOCB object at the tables tail
@@ -733,7 +733,7 @@ static int _sdp_iocb_q_put(struct sdpc_i
 	iocb->table = table;
 
 	return 0;
-} /* _sdp_iocb_q_put */
+}
 
 /*
  * sdp_iocb_q_get_tail - get an IOCB object from the tables tail
@@ -741,7 +741,7 @@ static int _sdp_iocb_q_put(struct sdpc_i
 struct sdpc_iocb *sdp_iocb_q_get_tail(struct sdpc_iocb_q *table)
 {
 	return _sdp_iocb_q_get(table, 0);
-} /* sdp_iocb_q_get_tail */
+}
 
 /*
  * sdp_iocb_q_get_head - get an IOCB object from the tables head
@@ -749,7 +749,7 @@ struct sdpc_iocb *sdp_iocb_q_get_tail(st
 struct sdpc_iocb *sdp_iocb_q_get_head(struct sdpc_iocb_q *table)
 {
 	return _sdp_iocb_q_get(table, 1);
-} /* sdp_iocb_q_get_head */
+}
 
 /*
  * sdp_iocb_q_put_tail - put the IOCB object at the tables tail
@@ -757,7 +757,7 @@ struct sdpc_iocb *sdp_iocb_q_get_head(st
 int sdp_iocb_q_put_tail(struct sdpc_iocb_q *table, struct sdpc_iocb *iocb)
 {
 	return _sdp_iocb_q_put(table, iocb, 0);
-} /* sdp_iocb_q_put_tail */
+}
 
 /*
  * sdp_iocb_q_put_head - put the IOCB object at the tables head
@@ -765,7 +765,7 @@ int sdp_iocb_q_put_tail(struct sdpc_iocb
 int sdp_iocb_q_put_head(struct sdpc_iocb_q *table, struct sdpc_iocb *iocb)
 {
 	return _sdp_iocb_q_put(table, iocb, 1);
-} /* sdp_iocb_q_put_head */
+}
 
 /*
  * sdp_iocb_q_cancel - cancel all outstanding AIOs in a queue
@@ -802,7 +802,7 @@ void sdp_iocb_q_cancel(struct sdpc_iocb_
 
 		iocb = next;
 	}
-} /* sdp_iocb_q_cancel */
+}
 
 /*
  * sdp_iocb_q_init - initialize a new empty IOCB table
@@ -811,7 +811,7 @@ void sdp_iocb_q_init(struct sdpc_iocb_q 
 {
 	table->head = NULL;
 	table->size = 0;
-} /* sdp_iocb_q_init */
+}
 
 /*
  * sdp_iocb_q_clear - clear the contents of an IOCB table
@@ -828,7 +828,7 @@ void sdp_iocb_q_clear(struct sdpc_iocb_q
 		result = sdp_iocb_destroy(iocb);
 		SDP_EXPECT(!(0 > result));
 	}
-} /* sdp_iocb_q_clear */
+}
 
 /*
  * primary initialization/cleanup functions
@@ -849,7 +849,7 @@ int sdp_main_iocb_init(void)
 	if (0 > result) {
 		sdp_warn("Error <%d> initializing memory locking.", result);
 		return result;
-	} /* if */
+	}
 	/*
 	 * initialize the caches only once.
 	 */
@@ -871,7 +871,7 @@ int sdp_main_iocb_init(void)
 error_iocb_c:
 	(void)_sdp_mem_lock_cleanup();
 	return result;
-} /* sdp_main_iocb_init */
+}
 
 /*
  * sdp_main_iocb_cleanup - cleanup the advertisment caches
@@ -891,4 +891,4 @@ void sdp_main_iocb_cleanup(void)
 	 * cleanup memory locking
 	 */
 	(void)_sdp_mem_lock_cleanup();
-} /* sdp_main_iocb_cleanup */
+}
Index: sdp_iocb.h
===================================================================
--- sdp_iocb.h	(revision 1906)
+++ sdp_iocb.h	(working copy)
@@ -137,7 +137,7 @@ static inline void *__sdp_kmap(struct pa
 		return kmap_atomic(page, KM_IRQ0);
 	else
 		return kmap(page);
-} /* __sdp_kmap */
+}
 
 /*
  * __sdp_kunmap - unmap a page into kernel space
@@ -149,6 +149,6 @@ static inline void __sdp_kunmap(struct p
 	else
 		kunmap(page);
 	return;
-} /* __sdp_kunmap */
+}
 
 #endif /* _SDP_IOCB_H */
Index: sdp_event.c
===================================================================
--- sdp_event.c	(revision 1906)
+++ sdp_event.c	(working copy)
@@ -123,7 +123,7 @@ int sdp_cq_event_locked(struct ib_wc *co
 
 done:
 	return result;
-} /* sdp_cq_event_locked */
+}
 
 /*
  * sdp_cq_event_handler - main per QP event handler, and demuxer
@@ -192,7 +192,7 @@ unlock:
 	sdp_conn_put(conn);
 done:
 	return;
-} /* sdp_cq_event_handler */
+}
 
 /*
  * Connection establishment IB/CM callback functions
@@ -295,7 +295,7 @@ error:
 	SDP_EXPECT(!(0 > expect));
 
 	return result;
-} /* _sdp_cm_idle */
+}
 
 /*
  * _sdp_cm_established - handler for connection established completion
@@ -404,7 +404,7 @@ error:
 done:
 	conn->cm_id = NULL;
 	return result;
-} /* _sdp_cm_established */
+}
 
 /*
  * _sdp_cm_timewait - handler for connection Time Wait completion
@@ -487,7 +487,7 @@ error:
 
 	conn->cm_id = NULL;
 	return result;
-} /* _sdp_cm_timewait */
+}
 
 /*
  * Primary Connection Managment callback function
@@ -557,4 +557,4 @@ int sdp_cm_event_handler(struct ib_cm_id
 	}
 
 	return result;
-} /* sdp_cm_event_handler */
+}
Index: sdp_buff.c
===================================================================
--- sdp_buff.c	(revision 1906)
+++ sdp_buff.c	(working copy)
@@ -79,7 +79,7 @@ static inline struct sdpc_buff *_sdp_buf
 		buff = NULL;
 
 	return buff;
-} /* _sdp_buff_q_get */
+}
 
 /*
  * _sdp_buff_q_put - Place a buffer into a specific pool
@@ -111,7 +111,7 @@ static inline int _sdp_buff_q_put(struct
 	buff->pool = pool;
 
 	return 0;
-} /* _sdp_buff_q_put */
+}
 
 /*
  * _sdp_buff_q_look - look at a buffer from a specific pool
@@ -123,7 +123,7 @@ static inline struct sdpc_buff *_sdp_buf
 		return pool->head;
 	else
 		return pool->head->prev;
-} /* _sdp_buff_q_look */
+}
 
 /*
  * _sdp_buff_q_remove - remove a specific buffer from a specific pool
@@ -156,7 +156,7 @@ static inline int _sdp_buff_q_remove(str
 	buff->prev = NULL;
 
 	return 0;
-} /* _sdp_buff_q_remove */
+}
 
 /*
  * sdp_buff_q_init - Init a pool drawing its buffers from the main pool
@@ -165,7 +165,7 @@ void sdp_buff_q_init(struct sdpc_buff_q 
 {
 	pool->head = NULL;
 	pool->size = 0;
-} /* sdp_buff_q_init */
+}
 
 /*
  * sdp_buff_q_remove - remove a specific buffer from a specific pool
@@ -176,7 +176,7 @@ int sdp_buff_q_remove(struct sdpc_buff *
 
 	pool = buff->pool;
 	return _sdp_buff_q_remove(pool, buff);
-} /* sdp_buff_q_remove */
+}
 
 /*
  * sdp_buff_q_get - Get a buffer from a specific pool
@@ -184,7 +184,7 @@ int sdp_buff_q_remove(struct sdpc_buff *
 struct sdpc_buff *sdp_buff_q_get(struct sdpc_buff_q *pool)
 {
 	return _sdp_buff_q_get(pool, 1, NULL, NULL);
-} /* sdp_buff_q_get */
+}
 
 /*
  * sdp_buff_q_get_head - Get the buffer at the front of the pool
@@ -192,7 +192,7 @@ struct sdpc_buff *sdp_buff_q_get(struct 
 struct sdpc_buff *sdp_buff_q_get_head(struct sdpc_buff_q *pool)
 {
 	return _sdp_buff_q_get(pool, 1, NULL, NULL);
-} /* sdp_buff_q_get_head */
+}
 
 /*
  * sdp_buff_q_get_tail - Get the buffer at the end of the pool
@@ -200,7 +200,7 @@ struct sdpc_buff *sdp_buff_q_get_head(st
 struct sdpc_buff *sdp_buff_q_get_tail(struct sdpc_buff_q *pool)
 {
 	return _sdp_buff_q_get(pool, 0, NULL, NULL);
-} /* sdp_buff_q_get_tail */
+}
 
 /*
  * sdp_buff_q_look_head - look at the buffer at the front of the pool
@@ -208,7 +208,7 @@ struct sdpc_buff *sdp_buff_q_get_tail(st
 struct sdpc_buff *sdp_buff_q_look_head(struct sdpc_buff_q *pool)
 {
 	return _sdp_buff_q_look(pool, 1);
-} /* sdp_buff_q_look_head */
+}
 
 /*
  * sdp_buff_q_fetch_head - Get the pools first buffer, if the test passes
@@ -219,7 +219,7 @@ struct sdpc_buff *sdp_buff_q_fetch_head(
 					void *usr_arg)
 {
 	return _sdp_buff_q_get(pool, 1, test, usr_arg);
-} /* sdp_buff_q_fetch_head */
+}
 
 /*
  * sdp_buff_q_fetch - Get the first matching buffer from the pool
@@ -255,7 +255,7 @@ struct sdpc_buff *sdp_buff_q_fetch(struc
 		}
 
 	return NULL;
-} /* sdp_buff_q_fetch_head */
+}
 
 /*
  * sdp_buff_q_trav_head - traverse buffers in pool, from the head
@@ -285,7 +285,7 @@ int sdp_buff_q_trav_head(struct sdpc_buf
 		}
 
 	return result;
-} /* sdp_buff_q_trav_head */
+}
 
 /*
  * sdp_buff_q_put - Place a buffer into a specific pool
@@ -294,7 +294,7 @@ int sdp_buff_q_put(struct sdpc_buff_q *p
 		   struct sdpc_buff *buff)
 {
 	return _sdp_buff_q_put(pool, buff, 1);
-} /* sdp_buff_q_put */
+}
 
 /*
  * sdp_buff_q_put_head - Place a buffer into the head of a specific pool
@@ -303,7 +303,7 @@ int sdp_buff_q_put_head(struct sdpc_buff
 			struct sdpc_buff *buff)
 {
 	return _sdp_buff_q_put(pool, buff, 1);
-} /* sdp_buff_q_put_head */
+}
 
 /*
  * sdp_buff_q_put_tail - Place a buffer into the tail of a specific pool
@@ -312,7 +312,7 @@ int sdp_buff_q_put_tail(struct sdpc_buff
 			struct sdpc_buff *buff)
 {
 	return _sdp_buff_q_put(pool, buff, 0);
-} /* sdp_buff_q_put_tail */
+}
 
 /*
  * sdp_buff_q_clear_unmap - clear the buffers out of a specific buffer pool
@@ -334,7 +334,7 @@ void sdp_buff_q_clear_unmap(struct sdpc_
 			sdp_dbg_err("Error <%d> returning buffer to main",
 				    result);
 	}
-} /* sdp_buff_q_clear_unmap */
+}
 
 /*
  * internal data buffer pool manager
@@ -362,7 +362,7 @@ static void _sdp_buff_pool_release(struc
 		free_page((unsigned long)buff->head);
 		kmem_cache_free(m_pool->buff_cache, buff);
 	}
-} /* _sdp_buff_pool_release */
+}
 
 /*
  * _sdp_buff_pool_release_check - check for buffer release from main pool
@@ -385,7 +385,7 @@ static inline void _sdp_buff_pool_releas
 
 		_sdp_buff_pool_release(m_pool, count);
 	}
-} /* _sdp_buff_pool_release_check */
+}
 
 /*
  * _sdp_buff_pool_alloc - allocate more buffers for the main pool
@@ -453,7 +453,7 @@ static int _sdp_buff_pool_alloc(struct s
 	}
 
 	return 0;
-} /* _sdp_buff_pool_alloc */
+}
 
 /*
  * sdp_buff_pool_init - Initialize the main buffer pool of memory
@@ -544,7 +544,7 @@ error_pool:
 done:
 	main_pool = NULL;
 	return result;
-} /* sdp_buff_pool_init */
+}
 
 /*
  * sdp_buff_pool_destroy - Destroy the main buffer pool and free its memory
@@ -579,7 +579,7 @@ void sdp_buff_pool_destroy(void)
 	 * done
 	 */
 	sdp_dbg_init("Main pool destroyed.");
-} /* sdp_buff_pool_destroy */
+}
 
 /*
  * sdp_buff_pool_get - Get a buffer from the main buffer pool
@@ -633,7 +633,7 @@ struct sdpc_buff *sdp_buff_pool_get(void
 	buff->wrid = 0;
 
 	return buff;
-} /* sdp_buff_pool_get */
+}
 
 /*
  * sdp_buff_pool_put - Return a buffer to the main buffer pool
@@ -675,7 +675,7 @@ int sdp_buff_pool_put(struct sdpc_buff *
 	spin_unlock_irqrestore(&main_pool->lock, flags);
 
 	return 0;
-} /* sdp_buff_pool_put */
+}
 
 /*
  * sdp_buff_pool_chain_link - create chain of buffers which can be returned
@@ -696,7 +696,7 @@ void sdp_buff_pool_chain_link(struct sdp
 		buff->next->prev = buff;
 		buff->prev->next = buff;
 	}
-} /* sdp_buff_pool_chain_link */
+}
 
 /*
  * sdp_buff_pool_chain_put - Return a buffer to the main buffer pool
@@ -737,7 +737,7 @@ int sdp_buff_pool_chain_put(struct sdpc_
 	spin_unlock_irqrestore(&main_pool->lock, flags);
 
 	return 0;
-} /* sdp_buff_pool_chain_put */
+}
 
 /*
  * sdp_buff_pool_buff_size - return the size of buffers in the main pool
@@ -752,7 +752,7 @@ int sdp_buff_pool_buff_size(void)
 		result = main_pool->buff_size;
 
 	return result;
-} /* sdp_buff_pool_buff_size */
+}
 
 /*
  * sdp_proc_dump_buff_pool - write the buffer pool stats to a file (/proc)
@@ -804,4 +804,4 @@ int sdp_proc_dump_buff_pool(char *buffer
 	spin_unlock_irqrestore(&main_pool->lock, flags);
 
 	return offset;
-} /* sdp_proc_dump_buff_pool */
+}
Index: sdp_queue.c
===================================================================
--- sdp_queue.c	(revision 1906)
+++ sdp_queue.c	(working copy)
@@ -72,7 +72,7 @@ static struct sdpc_desc *_sdp_desc_q_get
 	element->table = NULL;
 
 	return element;
-} /* _sdp_desc_q_get */
+}
 
 /*
  * _sdp_desc_q_put - Place an element into a specific table
@@ -108,7 +108,7 @@ static inline int _sdp_desc_q_put(struct
 	element->table = table;
 
 	return 0;
-} /* _sdp_desc_q_put */
+}
 
 /*
  * public advertisment object functions for FIFO object table
@@ -143,7 +143,7 @@ void sdp_desc_q_remove(struct sdpc_desc 
 	element->table = NULL;
 	element->next = NULL;
 	element->prev = NULL;
-} /* sdp_desc_q_remove */
+}
 
 /*
  * sdp_desc_q_lookup - search and return an element from the table
@@ -162,7 +162,7 @@ struct sdpc_desc *sdp_desc_q_lookup(stru
 			return element;
 
 	return NULL;
-} /* sdp_desc_q_lookup */
+}
 
 /*
  * sdp_desc_q_get_head - Get the element at the front of the table
@@ -170,7 +170,7 @@ struct sdpc_desc *sdp_desc_q_lookup(stru
 struct sdpc_desc *sdp_desc_q_get_head(struct sdpc_desc_q *table)
 {
 	return _sdp_desc_q_get(table, 1);
-} /* sdp_desc_q_get_head */
+}
 
 /*
  * sdp_desc_q_get_tail - Get the element at the end of the table
@@ -178,7 +178,7 @@ struct sdpc_desc *sdp_desc_q_get_head(st
 struct sdpc_desc *sdp_desc_q_get_tail(struct sdpc_desc_q *table)
 {
 	return _sdp_desc_q_get(table, 0);
-} /* sdp_desc_q_get_tail */
+}
 
 /*
  * sdp_desc_q_put_head - Place an element into the head of a table
@@ -187,7 +187,7 @@ int sdp_desc_q_put_head(struct sdpc_desc
 				struct sdpc_desc *element)
 {
 	return _sdp_desc_q_put(table, element, 1);
-} /* sdp_desc_q_put_head */
+}
 
 /*
  * sdp_desc_q_put_tail - Place an element into the tail of a table
@@ -196,7 +196,7 @@ int sdp_desc_q_put_tail(struct sdpc_desc
 				struct sdpc_desc *element)
 {
 	return _sdp_desc_q_put(table, element, 0);
-} /* sdp_desc_q_put_tail */
+}
 
 /*
  * sdp_desc_q_look_head - look at the front of the table
@@ -204,7 +204,7 @@ int sdp_desc_q_put_tail(struct sdpc_desc
 struct sdpc_desc *sdp_desc_q_look_head(struct sdpc_desc_q *table)
 {
 	return table->head;
-} /* sdp_desc_q_look_head */
+}
 
 /*
  * sdp_desc_q_type_head - look at the type at the front of the table
@@ -215,7 +215,7 @@ int sdp_desc_q_type_head(struct sdpc_des
 		return SDP_DESC_TYPE_NONE;
 	else
 		return table->head->type;
-} /* sdp_desc_q_type_head */
+}
 
 /*
  * sdp_desc_q_look_type_head - look at a specific object
@@ -227,7 +227,7 @@ struct sdpc_desc *sdp_desc_q_look_type_h
 		return NULL;
 	else
 		return ((type == table->head->type) ? table->head : NULL);
-} /* sdp_desc_q_look_type_head */
+}
 
 /*
  * sdp_desc_q_look_type_tail - look at the type at the end of the table
@@ -240,7 +240,7 @@ struct sdpc_desc *sdp_desc_q_look_type_t
 	else
 		return ((type == table->head->prev->type) ?
 			table->head->prev : NULL);
-} /* sdp_desc_q_look_type_tail */
+}
 
 /*
  * sdp_desc_q_types_size - return the number of elements in the table
@@ -250,7 +250,7 @@ int sdp_desc_q_types_size(struct sdpc_de
 {
 	return ((SDP_DESC_TYPE_NONE > type) ?
 		table->count[type] : -ERANGE);
-} /* sdp_desc_q_types_size */
+}
 
 /*
  * sdp_desc_q_init - initialize a new empty generic table
@@ -261,7 +261,7 @@ void sdp_desc_q_init(struct sdpc_desc_q 
 	table->size = 0;
 
 	memset(table, 0, sizeof(struct sdpc_desc_q));
-} /* sdp_desc_q_init */
+}
 
 /*
  * sdp_desc_q_clear - clear the contents of a generic table
@@ -279,4 +279,4 @@ void sdp_desc_q_clear(struct sdpc_desc_q
 			result = element->release(element);
 			SDP_EXPECT(!(0 > result));
 		}
-} /* sdp_desc_q_clear */
+}
Index: sdp_post.c
===================================================================
--- sdp_post.c	(revision 1906)
+++ sdp_post.c	(working copy)
@@ -64,7 +64,7 @@ int sdp_cm_listen_start(struct sdev_root
 		sdp_dbg_init("Started listening for SDP connection requests");
 
 	return result;
-} /* sdp_cm_listen_start */
+}
 
 /*
  * sdp_cm_listen_stop - stop listening on all possible socket ports
@@ -82,7 +82,7 @@ int sdp_cm_listen_stop(struct sdev_root 
 	dev_root->listen_id = NULL;
 
 	return result;
-} /* sdp_cm_listen_stop */
+}
 
 /*
  * _sdp_cm_disconnect - initiate a disconnect request using the CM
@@ -108,7 +108,7 @@ static void _sdp_cm_disconnect(void *arg
 	sdp_conn_put(conn);
 
 	return;
-} /* _sdp_cm_disconnect */
+}
 
 /*
  * _sdp_cm_reject - initiate a reject request using the CM
@@ -134,7 +134,7 @@ static void _sdp_cm_reject(void *arg)
 	sdp_conn_put(conn);
 
 	return;
-} /* _sdp_cm_reject */
+}
 
 /*
  * _sdp_cm_confirm - initiate a confirm request using the CM
@@ -158,7 +158,7 @@ static void _sdp_cm_confirm(void *arg)
 	sdp_conn_put(conn);
 
 	return;
-} /* _sdp_cm_confirm */
+}
 
 /*
  * _sdp_cm_failed - initiate a Failed request using the CM
@@ -185,7 +185,7 @@ static void _sdp_cm_failed(void *arg)
 	sdp_conn_put(conn);
 
 	return;
-} /* _sdp_cm_failed */
+}
 
 /*
  * _sdp_cm_deferred_generic - initiate a defered request using the CM
@@ -205,7 +205,7 @@ static int _sdp_cm_deferred_generic(stru
 		defer_func(conn);
 
 	return 0;
-} /* _sdp_cm_deferred_generic */
+}
 
 /*
  * sdp_cm_disconnect - initiate a disconnect request using the CM
@@ -213,7 +213,7 @@ static int _sdp_cm_deferred_generic(stru
 int sdp_cm_disconnect(struct sdp_opt *conn)
 {
 	return _sdp_cm_deferred_generic(conn, _sdp_cm_disconnect);
-} /* sdp_cm_disconnect */
+}
 
 /*
  * sdp_cm_reject - initiate a reject request using the CM
@@ -221,7 +221,7 @@ int sdp_cm_disconnect(struct sdp_opt *co
 int sdp_cm_reject(struct sdp_opt *conn)
 {
 	return _sdp_cm_deferred_generic(conn, _sdp_cm_reject);
-} /* sdp_cm_reject */
+}
 
 /*
  * sdp_cm_confirm - initiate a confirm request using the CM
@@ -229,7 +229,7 @@ int sdp_cm_reject(struct sdp_opt *conn)
 int sdp_cm_confirm(struct sdp_opt *conn)
 {
 	return _sdp_cm_deferred_generic(conn, _sdp_cm_confirm);
-} /* sdp_cm_confirm */
+}
 
 /*
  * sdp_cm_failed - initiate a failed request using the CM
@@ -237,4 +237,4 @@ int sdp_cm_confirm(struct sdp_opt *conn)
 int sdp_cm_failed(struct sdp_opt *conn)
 {
 	return _sdp_cm_deferred_generic(conn, _sdp_cm_failed);
-} /* sdp_cm_failed */
+}

-- 
MST - Michael S. Tsirkin



More information about the general mailing list