[openib-general] [PATCH] remove return at the end of void functions

Michael S. Tsirkin mst at mellanox.co.il
Thu Feb 24 13:15:04 PST 2005


Removes return at the end of void functions, and a couple of extra
empty lines too.

Applies on top of previous patch [which removed the trailing comments].

Signed-off-by: Michael S. Tsirkin <mst at mellanox.co.il>


diff -rup sdp_old/sdp_actv.c sdp/sdp_actv.c
--- sdp_old/sdp_actv.c	2005-02-24 22:59:38.000000000 +0200
+++ sdp/sdp_actv.c	2005-02-24 23:07:53.000000000 +0200
@@ -535,8 +535,6 @@ failed:
 done:
 	sdp_conn_unlock(conn);
 	sdp_conn_put(conn);
-
-	return;
 }
 
 /*
diff -rup sdp_old/sdp_conn.c sdp/sdp_conn.c
--- sdp_old/sdp_conn.c	2005-02-24 22:59:38.000000000 +0200
+++ sdp/sdp_conn.c	2005-02-24 23:07:53.000000000 +0200
@@ -806,8 +806,6 @@ void sdp_conn_internal_lock(struct sdp_o
 
 	current->state = TASK_RUNNING;
 	remove_wait_queue(&(conn->lock.waitq), &wait);
-
-	return;
 }
 
 /*
@@ -872,7 +870,6 @@ void sdp_conn_relock(struct sdp_opt *con
 	conn->flags &= ~SDP_CONN_F_MASK_EVENT;
 
 	spin_unlock_irqrestore(&conn->lock.slock, flags);
-	return;
 }
 
 /*
@@ -945,8 +942,6 @@ void sdp_conn_internal_unlock(struct sdp
 
 		conn->flags &= ~SDP_CONN_F_MASK_EVENT;
 	}
-
-	return;
 }
 
 /*
Only in sdp/: sdp_event.c~
diff -rup sdp_old/sdp_inet.c sdp/sdp_inet.c
--- sdp_old/sdp_inet.c	2005-02-24 22:59:38.000000000 +0200
+++ sdp/sdp_inet.c	2005-02-24 23:07:53.000000000 +0200
@@ -179,7 +179,6 @@ void sdp_inet_wake_urg(struct sock *sk)
 	 */
 	if (NULL != sk)
 		sk_send_sigurg(sk);
-
 }
 
 /*
diff -rup sdp_old/sdp_iocb.c sdp/sdp_iocb.c
--- sdp_old/sdp_iocb.c	2005-02-24 22:59:39.000000000 +0200
+++ sdp/sdp_iocb.c	2005-02-24 23:07:53.000000000 +0200
@@ -526,7 +526,6 @@ static void _sdp_iocb_complete(void *arg
 	if (0 > result)
 		sdp_dbg_err("Error <%d> deleting IOCB <%d> of status <%Zu>",
 			    result, iocb->key, iocb->status);
-
 }
 
 /*
diff -rup sdp_old/sdp_iocb.h sdp/sdp_iocb.h
--- sdp_old/sdp_iocb.h	2005-02-24 22:59:39.000000000 +0200
+++ sdp/sdp_iocb.h	2005-02-24 23:07:53.000000000 +0200
@@ -148,7 +148,6 @@ static inline void __sdp_kunmap(struct p
 		kunmap_atomic(page, KM_IRQ0);
 	else
 		kunmap(page);
-	return;
 }
 
 #endif /* _SDP_IOCB_H */
diff -rup sdp_old/sdp_link.c sdp/sdp_link.c
--- sdp_old/sdp_link.c	2005-02-24 22:59:38.000000000 +0200
+++ sdp/sdp_link.c	2005-02-24 23:07:53.000000000 +0200
@@ -92,7 +92,6 @@ static void _sdp_link_path_complete(u64 
 	     arg);
 
 	info->use = jiffies;
-	return;
 }
 
 /*
@@ -108,8 +107,6 @@ static void _sdp_path_wait_add(struct sd
 
 	if (NULL != wait->next)
 		wait->next->pext = &wait->next;
-
-	return;
 }
 
 /*
@@ -131,8 +128,6 @@ static void _sdp_path_wait_destroy(struc
 	}
 
 	kmem_cache_free(_wait_cache, wait);
-
-	return;
 }
 
 /*
@@ -149,8 +144,6 @@ static void _sdp_path_wait_complete(stru
 				wait->arg);
 
 	_sdp_path_wait_destroy(wait);
-
-	return;
 }
 
 /*
@@ -222,8 +215,6 @@ static void _sdp_path_info_destroy(struc
 
 	cancel_delayed_work(&info->timer);
 	kmem_cache_free(_info_cache, info);
-
-	return;
 }
 
 /*
@@ -290,8 +281,6 @@ static void _sdp_link_path_rec_done(int 
 			_sdp_path_info_destroy(info, result);
 		}
 	}
-
-	return;
 }
 
 /*
@@ -526,7 +515,6 @@ done:
 	return;
 error:
 	_sdp_path_info_destroy(info, result);
-	return;
 }
 
 /*
@@ -633,7 +621,6 @@ static void _sdp_link_sweep(void *data)
 	}
 
 	queue_delayed_work(_link_wq, &_link_timer, SDP_LINK_SWEEP_INTERVAL);
-	return;
 }
 
 /*
@@ -687,7 +674,6 @@ static void _sdp_link_arp_work(void *dat
 done:
 	kfree_skb(skb);
 	kfree(work);
-	return;
 }
 
 /*
diff -rup sdp_old/sdp_msgs.h sdp/sdp_msgs.h
--- sdp_old/sdp_msgs.h	2005-02-24 22:59:38.000000000 +0200
+++ sdp/sdp_msgs.h	2005-02-24 23:07:53.000000000 +0200
@@ -359,7 +359,6 @@ static inline void __sdp_msg_swap_rrch(s
  */
 static inline void __sdp_msg_swap_mch(struct msg_hdr_mch *header)
 {
-	return;
 }
 
 /*
diff -rup sdp_old/sdp_post.c sdp/sdp_post.c
--- sdp_old/sdp_post.c	2005-02-24 22:59:39.000000000 +0200
+++ sdp/sdp_post.c	2005-02-24 23:07:53.000000000 +0200
@@ -106,8 +106,6 @@ static void _sdp_cm_disconnect(void *arg
 		sdp_dbg_warn(NULL, "Error <%d> CM disconnect request", result);
 
 	sdp_conn_put(conn);
-
-	return;
 }
 
 /*
@@ -132,8 +130,6 @@ static void _sdp_cm_reject(void *arg)
 		sdp_dbg_warn(NULL, "Error <%d> CM reject request", result);
 
 	sdp_conn_put(conn);
-
-	return;
 }
 
 /*
@@ -156,8 +152,6 @@ static void _sdp_cm_confirm(void *arg)
 		sdp_dbg_warn(NULL, "Error <%d> CM confirm request", result);
 
 	sdp_conn_put(conn);
-
-	return;
 }
 
 /*
@@ -183,8 +177,6 @@ static void _sdp_cm_failed(void *arg)
 		sdp_dbg_warn(NULL, "Error <%d> CM failed request", result);
 
 	sdp_conn_put(conn);
-
-	return;
 }
 
 /*

-- 
MST - Michael S. Tsirkin



More information about the general mailing list