staging: lustre: remove returns in void function for lnet selftest

jamesasimmons · gregkh · commit 8a2c23068e2a · 2016-03-11T22:24:47.000-08:00
No reason to have returns at end of void function.

Signed-off-by: James Simmons &lt;jsimmons@infradead.org&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
@@ -331,7 +331,7 @@ brw_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
 		       libcfs_id2str(rpc->crpc_dest), rpc->crpc_status);
 		if (!tsi->tsi_stopping) /* rpc could have been aborted */
 			atomic_inc(&sn->sn_brw_errors);
-		goto out;
+		return;
 	}
 
 	if (msg->msg_magic != SRPC_MSG_MAGIC) {
@@ -346,21 +346,18 @@ brw_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
 	if (reply->brw_status) {
 		atomic_inc(&sn->sn_brw_errors);
 		rpc->crpc_status = -(int)reply->brw_status;
-		goto out;
+		return;
 	}
 
 	if (reqst->brw_rw == LST_BRW_WRITE)
-		goto out;
+		return;
 
 	if (brw_check_bulk(&rpc->crpc_bulk, reqst->brw_flags, magic)) {
 		CERROR("Bulk data from %s is corrupted!\n",
 		       libcfs_id2str(rpc->crpc_dest));
 		atomic_inc(&sn->sn_brw_errors);
 		rpc->crpc_status = -EBADMSG;
 	}
-
-out:
-	return;
 }
 
 static void
diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.c b/drivers/staging/lustre/lnet/selftest/conrpc.c
@@ -463,8 +463,6 @@ lstcon_rpc_trans_stat(lstcon_rpc_trans_t *trans, lstcon_trans_stat_t *stat)
 	       lstcon_rpc_stat_failure(stat, 0),
 	       lstcon_rpc_stat_total(stat, 0),
 	       stat->trs_rpc_errno, stat->trs_fwk_errno);
-
-	return;
 }
 
 int
@@ -593,8 +591,6 @@ lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans)
 	       lstcon_rpc_trans_name(trans->tas_opc), count);
 
 	LIBCFS_FREE(trans, sizeof(*trans));
-
-	return;
 }
 
 int
@@ -1084,8 +1080,6 @@ lstcon_rpc_stat_reply(lstcon_rpc_trans_t *trans, srpc_msg_t *msg,
 
 	if (!stat->trs_fwk_errno)
 		stat->trs_fwk_errno = rc;
-
-	return;
 }
 
 int
diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
@@ -172,7 +172,6 @@ sfw_add_session_timer(void)
 	sn->sn_timer_active = 1;
 	timer->stt_expires = ktime_get_real_seconds() + sn->sn_timeout;
 	stt_add_timer(timer);
-	return;
 }
 
 static int
@@ -296,7 +295,6 @@ sfw_server_rpc_done(struct srpc_server_rpc *rpc)
 
 	if (rpc->srpc_bulk)
 		sfw_free_pages(rpc);
-	return;
 }
 
 static void
@@ -613,7 +611,6 @@ sfw_unload_test(struct sfw_test_instance *tsi)
 	 */
 	srpc_service_remove_buffers(tsc->tsc_srv_service,
 				    sfw_test_buffers(tsi));
-	return;
 }
 
 static void
@@ -648,7 +645,6 @@ sfw_destroy_test_instance(sfw_test_instance_t *tsi)
 clean:
 	sfw_unload_test(tsi);
 	LIBCFS_FREE(tsi, sizeof(*tsi));
-	return;
 }
 
 static void
@@ -667,7 +663,6 @@ sfw_destroy_batch(sfw_batch_t *tsb)
 	}
 
 	LIBCFS_FREE(tsb, sizeof(sfw_batch_t));
-	return;
 }
 
 void
@@ -687,7 +682,6 @@ sfw_destroy_session(sfw_session_t *sn)
 
 	LIBCFS_FREE(sn, sizeof(*sn));
 	atomic_dec(&sfw_data.fw_nzombies);
-	return;
 }
 
 static void
@@ -732,7 +726,6 @@ sfw_unpack_addtest_req(srpc_msg_t *msg)
 	}
 
 	LBUG();
-	return;
 }
 
 static int
@@ -870,7 +863,6 @@ sfw_test_unit_done(sfw_test_unit_t *tsu)
 	spin_unlock(&sfw_data.fw_lock);
 
 	sfw_destroy_session(sn);
-	return;
 }
 
 static void
@@ -905,7 +897,6 @@ sfw_test_rpc_done(srpc_client_rpc_t *rpc)
 	}
 
 	sfw_test_unit_done(tsu);
-	return;
 }
 
 int
@@ -1565,7 +1556,6 @@ sfw_unpack_message(srpc_msg_t *msg)
 	}
 
 	LBUG();
-	return;
 }
 
 void
@@ -1577,7 +1567,6 @@ sfw_abort_rpc(srpc_client_rpc_t *rpc)
 	spin_lock(&rpc->crpc_lock);
 	srpc_abort_rpc(rpc, -EINTR);
 	spin_unlock(&rpc->crpc_lock);
-	return;
 }
 
 void
@@ -1594,7 +1583,6 @@ sfw_post_rpc(srpc_client_rpc_t *rpc)
 	srpc_post_rpc(rpc);
 
 	spin_unlock(&rpc->crpc_lock);
-	return;
 }
 
 static srpc_service_t sfw_services[] = {
@@ -1798,6 +1786,4 @@ sfw_shutdown(void)
 		list_del(&tsc->tsc_list);
 		LIBCFS_FREE(tsc, sizeof(*tsc));
 	}
-
-	return;
 }
diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
@@ -165,7 +165,6 @@ ping_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
 	CDEBUG(D_NET, "%d reply in %u usec\n", reply->pnr_seq,
 	       (unsigned)((ts.tv_sec - reqst->pnr_time_sec) * 1000000 +
 			  (ts.tv_nsec / NSEC_PER_USEC - reqst->pnr_time_usec)));
-	return;
 }
 
 static int
diff --git a/drivers/staging/lustre/lnet/selftest/rpc.c b/drivers/staging/lustre/lnet/selftest/rpc.c
@@ -118,7 +118,6 @@ srpc_free_bulk(srpc_bulk_t *bk)
 	}
 
 	LIBCFS_FREE(bk, offsetof(srpc_bulk_t, bk_iovs[bk->bk_niov]));
-	return;
 }
 
 srpc_bulk_t *
@@ -960,7 +959,6 @@ srpc_server_rpc_done(struct srpc_server_rpc *rpc, int status)
 	}
 
 	spin_unlock(&scd->scd_lock);
-	return;
 }
 
 /* handles an incoming RPC */
@@ -1110,7 +1108,6 @@ srpc_add_client_rpc_timer(srpc_client_rpc_t *rpc)
 	timer->stt_func    = srpc_client_rpc_expired;
 	timer->stt_expires = ktime_get_real_seconds() + rpc->crpc_timeout;
 	stt_add_timer(timer);
-	return;
 }
 
 /*
@@ -1174,7 +1171,6 @@ srpc_client_rpc_done(srpc_client_rpc_t *rpc, int status)
 	spin_unlock(&rpc->crpc_lock);
 
 	(*rpc->crpc_done)(rpc);
-	return;
 }
 
 /* sends an outgoing RPC */
@@ -1347,7 +1343,6 @@ srpc_abort_rpc(srpc_client_rpc_t *rpc, int why)
 	rpc->crpc_aborted = 1;
 	rpc->crpc_status  = why;
 	swi_schedule_workitem(&rpc->crpc_wi);
-	return;
 }
 
 /* called with rpc->crpc_lock held */
@@ -1363,7 +1358,6 @@ srpc_post_rpc(srpc_client_rpc_t *rpc)
 
 	srpc_add_client_rpc_timer(rpc);
 	swi_schedule_workitem(&rpc->crpc_wi);
-	return;
 }
 
 int
@@ -1689,6 +1683,4 @@ srpc_shutdown(void)
 	case SRPC_STATE_NI_INIT:
 		LNetNIFini();
 	}
-
-	return;
 }
diff --git a/drivers/staging/lustre/lnet/selftest/selftest.h b/drivers/staging/lustre/lnet/selftest/selftest.h
@@ -512,8 +512,6 @@ srpc_destroy_client_rpc(srpc_client_rpc_t *rpc)
 		LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc));
 	else
 		(*rpc->crpc_fini) (rpc);
-
-	return;
 }
 
 static inline void
@@ -552,7 +550,6 @@ srpc_init_client_rpc(srpc_client_rpc_t *rpc, lnet_process_id_t peer,
 	rpc->crpc_reqstmsg.msg_magic   = SRPC_MSG_MAGIC;
 	rpc->crpc_reqstmsg.msg_version = SRPC_MSG_VERSION;
 	rpc->crpc_reqstmsg.msg_type    = srpc_service2request(service);
-	return;
 }
 
 static inline const char *

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,6 @@ sfw_add_session_timer(void)`
`172`	`172`	`sn->sn_timer_active = 1;`
`173`	`173`	`timer->stt_expires = ktime_get_real_seconds() + sn->sn_timeout;`
`174`	`174`	`stt_add_timer(timer);`
`175`		`- return;`
`176`	`175`	`}`
`177`	`176`
`178`	`177`	`static int`
`@@ -296,7 +295,6 @@ sfw_server_rpc_done(struct srpc_server_rpc *rpc)`
`296`	`295`
`297`	`296`	`if (rpc->srpc_bulk)`
`298`	`297`	`sfw_free_pages(rpc);`
`299`		`- return;`
`300`	`298`	`}`
`301`	`299`
`302`	`300`	`static void`
`@@ -613,7 +611,6 @@ sfw_unload_test(struct sfw_test_instance *tsi)`
`613`	`611`	`*/`
`614`	`612`	`srpc_service_remove_buffers(tsc->tsc_srv_service,`
`615`	`613`	`sfw_test_buffers(tsi));`
`616`		`- return;`
`617`	`614`	`}`
`618`	`615`
`619`	`616`	`static void`
`@@ -648,7 +645,6 @@ sfw_destroy_test_instance(sfw_test_instance_t *tsi)`
`648`	`645`	`clean:`
`649`	`646`	`sfw_unload_test(tsi);`
`650`	`647`	`LIBCFS_FREE(tsi, sizeof(*tsi));`
`651`		`- return;`
`652`	`648`	`}`
`653`	`649`
`654`	`650`	`static void`
`@@ -667,7 +663,6 @@ sfw_destroy_batch(sfw_batch_t *tsb)`
`667`	`663`	`}`
`668`	`664`
`669`	`665`	`LIBCFS_FREE(tsb, sizeof(sfw_batch_t));`
`670`		`- return;`
`671`	`666`	`}`
`672`	`667`
`673`	`668`	`void`
`@@ -687,7 +682,6 @@ sfw_destroy_session(sfw_session_t *sn)`
`687`	`682`
`688`	`683`	`LIBCFS_FREE(sn, sizeof(*sn));`
`689`	`684`	`atomic_dec(&sfw_data.fw_nzombies);`
`690`		`- return;`
`691`	`685`	`}`
`692`	`686`
`693`	`687`	`static void`
`@@ -732,7 +726,6 @@ sfw_unpack_addtest_req(srpc_msg_t *msg)`
`732`	`726`	`}`
`733`	`727`
`734`	`728`	`LBUG();`
`735`		`- return;`
`736`	`729`	`}`
`737`	`730`
`738`	`731`	`static int`
`@@ -870,7 +863,6 @@ sfw_test_unit_done(sfw_test_unit_t *tsu)`
`870`	`863`	`spin_unlock(&sfw_data.fw_lock);`
`871`	`864`
`872`	`865`	`sfw_destroy_session(sn);`
`873`		`- return;`
`874`	`866`	`}`
`875`	`867`
`876`	`868`	`static void`
`@@ -905,7 +897,6 @@ sfw_test_rpc_done(srpc_client_rpc_t *rpc)`
`905`	`897`	`}`
`906`	`898`
`907`	`899`	`sfw_test_unit_done(tsu);`
`908`		`- return;`
`909`	`900`	`}`
`910`	`901`
`911`	`902`	`int`
`@@ -1565,7 +1556,6 @@ sfw_unpack_message(srpc_msg_t *msg)`
`1565`	`1556`	`}`
`1566`	`1557`
`1567`	`1558`	`LBUG();`
`1568`		`- return;`
`1569`	`1559`	`}`
`1570`	`1560`
`1571`	`1561`	`void`
`@@ -1577,7 +1567,6 @@ sfw_abort_rpc(srpc_client_rpc_t *rpc)`
`1577`	`1567`	`spin_lock(&rpc->crpc_lock);`
`1578`	`1568`	`srpc_abort_rpc(rpc, -EINTR);`
`1579`	`1569`	`spin_unlock(&rpc->crpc_lock);`
`1580`		`- return;`
`1581`	`1570`	`}`
`1582`	`1571`
`1583`	`1572`	`void`
`@@ -1594,7 +1583,6 @@ sfw_post_rpc(srpc_client_rpc_t *rpc)`
`1594`	`1583`	`srpc_post_rpc(rpc);`
`1595`	`1584`
`1596`	`1585`	`spin_unlock(&rpc->crpc_lock);`
`1597`		`- return;`
`1598`	`1586`	`}`
`1599`	`1587`
`1600`	`1588`	`static srpc_service_t sfw_services[] = {`
`@@ -1798,6 +1786,4 @@ sfw_shutdown(void)`
`1798`	`1786`	`list_del(&tsc->tsc_list);`
`1799`	`1787`	`LIBCFS_FREE(tsc, sizeof(*tsc));`
`1800`	`1788`	`}`
`1801`		`-`
`1802`		`- return;`
`1803`	`1789`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,6 @@ ping_client_done_rpc(sfw_test_unit_t tsu, srpc_client_rpc_t rpc)`
`165`	`165`	`CDEBUG(D_NET, "%d reply in %u usec\n", reply->pnr_seq,`
`166`	`166`	`(unsigned)((ts.tv_sec - reqst->pnr_time_sec) * 1000000 +`
`167`	`167`	`(ts.tv_nsec / NSEC_PER_USEC - reqst->pnr_time_usec)));`
`168`		`- return;`
`169`	`168`	`}`
`170`	`169`
`171`	`170`	`static int`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ srpc_free_bulk(srpc_bulk_t *bk)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`LIBCFS_FREE(bk, offsetof(srpc_bulk_t, bk_iovs[bk->bk_niov]));`
`121`		`- return;`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`srpc_bulk_t *`
`@@ -960,7 +959,6 @@ srpc_server_rpc_done(struct srpc_server_rpc *rpc, int status)`
`960`	`959`	`}`
`961`	`960`
`962`	`961`	`spin_unlock(&scd->scd_lock);`
`963`		`- return;`
`964`	`962`	`}`
`965`	`963`
`966`	`964`	`/* handles an incoming RPC */`
`@@ -1110,7 +1108,6 @@ srpc_add_client_rpc_timer(srpc_client_rpc_t *rpc)`
`1110`	`1108`	`timer->stt_func = srpc_client_rpc_expired;`
`1111`	`1109`	`timer->stt_expires = ktime_get_real_seconds() + rpc->crpc_timeout;`
`1112`	`1110`	`stt_add_timer(timer);`
`1113`		`- return;`
`1114`	`1111`	`}`
`1115`	`1112`
`1116`	`1113`	`/*`
`@@ -1174,7 +1171,6 @@ srpc_client_rpc_done(srpc_client_rpc_t *rpc, int status)`
`1174`	`1171`	`spin_unlock(&rpc->crpc_lock);`
`1175`	`1172`
`1176`	`1173`	`(*rpc->crpc_done)(rpc);`
`1177`		`- return;`
`1178`	`1174`	`}`
`1179`	`1175`
`1180`	`1176`	`/* sends an outgoing RPC */`
`@@ -1347,7 +1343,6 @@ srpc_abort_rpc(srpc_client_rpc_t *rpc, int why)`
`1347`	`1343`	`rpc->crpc_aborted = 1;`
`1348`	`1344`	`rpc->crpc_status = why;`
`1349`	`1345`	`swi_schedule_workitem(&rpc->crpc_wi);`
`1350`		`- return;`
`1351`	`1346`	`}`
`1352`	`1347`
`1353`	`1348`	`/* called with rpc->crpc_lock held */`
`@@ -1363,7 +1358,6 @@ srpc_post_rpc(srpc_client_rpc_t *rpc)`
`1363`	`1358`
`1364`	`1359`	`srpc_add_client_rpc_timer(rpc);`
`1365`	`1360`	`swi_schedule_workitem(&rpc->crpc_wi);`
`1366`		`- return;`
`1367`	`1361`	`}`
`1368`	`1362`
`1369`	`1363`	`int`
`@@ -1689,6 +1683,4 @@ srpc_shutdown(void)`
`1689`	`1683`	`case SRPC_STATE_NI_INIT:`
`1690`	`1684`	`LNetNIFini();`
`1691`	`1685`	`}`
`1692`		`-`
`1693`		`- return;`
`1694`	`1686`	`}`
Original file line number	Diff line number	Diff line change
`@@ -512,8 +512,6 @@ srpc_destroy_client_rpc(srpc_client_rpc_t *rpc)`
`512`	`512`	`LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc));`
`513`	`513`	`else`
`514`	`514`	`(*rpc->crpc_fini) (rpc);`
`515`		`-`
`516`		`- return;`
`517`	`515`	`}`
`518`	`516`
`519`	`517`	`static inline void`
`@@ -552,7 +550,6 @@ srpc_init_client_rpc(srpc_client_rpc_t *rpc, lnet_process_id_t peer,`
`552`	`550`	`rpc->crpc_reqstmsg.msg_magic = SRPC_MSG_MAGIC;`
`553`	`551`	`rpc->crpc_reqstmsg.msg_version = SRPC_MSG_VERSION;`
`554`	`552`	`rpc->crpc_reqstmsg.msg_type = srpc_service2request(service);`
`555`		`- return;`
`556`	`553`	`}`
`557`	`554`
`558`	`555`	`static inline const char *`