[PATCH] net/smc: Simplify the return expression

Subsystems: networking [general], shared memory communications (smc) sockets, the rest

STALE1985d

2 messages, 2 authors, 2021-03-23 · open the first message on its own page

[PATCH] net/smc: Simplify the return expression

From: <hidden>
Date: 2021-03-23 02:07:17

From: zuoqilin <redacted>

Simplify the return expression of smc_ism_signal_shutdown().

Signed-off-by: zuoqilin <redacted>
---
 net/smc/smc_ism.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c
index 9c6e958..c3558cc 100644
--- a/net/smc/smc_ism.c
+++ b/net/smc/smc_ism.c
@@ -344,7 +344,6 @@ static void smcd_handle_sw_event(struct smc_ism_event_work *wrk)
 
 int smc_ism_signal_shutdown(struct smc_link_group *lgr)
 {
-	int rc;
 	union smcd_sw_event_info ev_info;
 
 	if (lgr->peer_shutdown)
@@ -353,11 +352,10 @@ int smc_ism_signal_shutdown(struct smc_link_group *lgr)
 	memcpy(ev_info.uid, lgr->id, SMC_LGR_ID_SIZE);
 	ev_info.vlan_id = lgr->vlan_id;
 	ev_info.code = ISM_EVENT_REQUEST;
-	rc = lgr->smcd->ops->signal_event(lgr->smcd, lgr->peer_gid,
+	return lgr->smcd->ops->signal_event(lgr->smcd, lgr->peer_gid,
 					  ISM_EVENT_REQUEST_IR,
 					  ISM_EVENT_CODE_SHUTDOWN,
 					  ev_info.info);
-	return rc;
 }
 
 /* worker for SMC-D events */
-- 
1.9.1

Re: [PATCH] net/smc: Simplify the return expression

From: Karsten Graul <hidden>
Date: 2021-03-23 16:43:28

On 23/03/2021 03:05, zuoqilin1@163.com wrote:
quoted hunk
From: zuoqilin <redacted>

Simplify the return expression of smc_ism_signal_shutdown().

Signed-off-by: zuoqilin <redacted>
---
 net/smc/smc_ism.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c
index 9c6e958..c3558cc 100644
--- a/net/smc/smc_ism.c
+++ b/net/smc/smc_ism.c
@@ -344,7 +344,6 @@ static void smcd_handle_sw_event(struct smc_ism_event_work *wrk)
 
 int smc_ism_signal_shutdown(struct smc_link_group *lgr)
 {
-	int rc;
 	union smcd_sw_event_info ev_info;
 
 	if (lgr->peer_shutdown)
@@ -353,11 +352,10 @@ int smc_ism_signal_shutdown(struct smc_link_group *lgr)
 	memcpy(ev_info.uid, lgr->id, SMC_LGR_ID_SIZE);
 	ev_info.vlan_id = lgr->vlan_id;
 	ev_info.code = ISM_EVENT_REQUEST;
-	rc = lgr->smcd->ops->signal_event(lgr->smcd, lgr->peer_gid,
+	return lgr->smcd->ops->signal_event(lgr->smcd, lgr->peer_gid,
 					  ISM_EVENT_REQUEST_IR,
 					  ISM_EVENT_CODE_SHUTDOWN,
 					  ev_info.info);
I agree with the code change but after I applied your patch the 3 lines above
are no longer correctly indented, please correct that and resend the patch.
Thanks.
-	return rc;
 }
 
 /* worker for SMC-D events */
-- 
Karsten

(I'm a dude)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help