Skip to content

Commit a8d63a5

Browse files
Zhu Yanjundavem330
authored andcommitted
rds: remove unnecessary returned value check
The function rds_trans_register always returns 0. As such, it is not necessary to check the returned value. Cc: Joe Jin <[email protected]> Cc: Junxiao Bi <[email protected]> Signed-off-by: Zhu Yanjun <[email protected]> Reviewed-by: Yuval Shaia <[email protected]> Acked-by: Santosh Shilimkar <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 37411ca commit a8d63a5

File tree

4 files changed

+4
-14
lines changed

4 files changed

+4
-14
lines changed

net/rds/ib.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -438,16 +438,12 @@ int rds_ib_init(void)
438438
if (ret)
439439
goto out_sysctl;
440440

441-
ret = rds_trans_register(&rds_ib_transport);
442-
if (ret)
443-
goto out_recv;
441+
rds_trans_register(&rds_ib_transport);
444442

445443
rds_info_register_func(RDS_INFO_IB_CONNECTIONS, rds_ib_ic_info);
446444

447445
goto out;
448446

449-
out_recv:
450-
rds_ib_recv_exit();
451447
out_sysctl:
452448
rds_ib_sysctl_exit();
453449
out_ibreg:

net/rds/rds.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ void rds_connect_path_complete(struct rds_conn_path *conn, int curr);
910910
void rds_connect_complete(struct rds_connection *conn);
911911

912912
/* transport.c */
913-
int rds_trans_register(struct rds_transport *trans);
913+
void rds_trans_register(struct rds_transport *trans);
914914
void rds_trans_unregister(struct rds_transport *trans);
915915
struct rds_transport *rds_trans_get_preferred(struct net *net, __be32 addr);
916916
void rds_trans_put(struct rds_transport *trans);

net/rds/tcp.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -652,16 +652,12 @@ static int rds_tcp_init(void)
652652
if (ret)
653653
goto out_pernet;
654654

655-
ret = rds_trans_register(&rds_tcp_transport);
656-
if (ret)
657-
goto out_recv;
655+
rds_trans_register(&rds_tcp_transport);
658656

659657
rds_info_register_func(RDS_INFO_TCP_SOCKETS, rds_tcp_tc_info);
660658

661659
goto out;
662660

663-
out_recv:
664-
rds_tcp_recv_exit();
665661
out_pernet:
666662
unregister_pernet_subsys(&rds_tcp_net_ops);
667663
out_notifier:

net/rds/transport.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
static struct rds_transport *transports[RDS_TRANS_COUNT];
4141
static DECLARE_RWSEM(rds_trans_sem);
4242

43-
int rds_trans_register(struct rds_transport *trans)
43+
void rds_trans_register(struct rds_transport *trans)
4444
{
4545
BUG_ON(strlen(trans->t_name) + 1 > TRANSNAMSIZ);
4646

@@ -55,8 +55,6 @@ int rds_trans_register(struct rds_transport *trans)
5555
}
5656

5757
up_write(&rds_trans_sem);
58-
59-
return 0;
6058
}
6159
EXPORT_SYMBOL_GPL(rds_trans_register);
6260

0 commit comments

Comments
 (0)