On Fri, Mar 03, 2017 at 12:44:26AM -0500, Zhu Yanjun wrote:
> The function rds_trans_register always returns 0. As such, it is not
> necessary to check the returned value.
>
> Cc: Joe Jin <joe....@oracle.com>
> Cc: Junxiao Bi <junxiao...@oracle.com>
> Signed-off-by: Zhu Yanjun <yanjun....@oracle.com>
> ---
> net/rds/ib.c | 6 +-----
> net/rds/rds.h | 2 +-
> net/rds/tcp.c | 6 +-----
> net/rds/transport.c | 4 +---
> 4 files changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/net/rds/ib.c b/net/rds/ib.c
> index 0f557b2..7a64c8d 100644
> --- a/net/rds/ib.c
> +++ b/net/rds/ib.c
> @@ -438,16 +438,12 @@ int rds_ib_init(void)
> if (ret)
> goto out_sysctl;
>
> - ret = rds_trans_register(&rds_ib_transport);
> - if (ret)
> - goto out_recv;
> + rds_trans_register(&rds_ib_transport);
>
> rds_info_register_func(RDS_INFO_IB_CONNECTIONS, rds_ib_ic_info);
>
> goto out;
>
> -out_recv:
> - rds_ib_recv_exit();
> out_sysctl:
> rds_ib_sysctl_exit();
> out_ibreg:
> diff --git a/net/rds/rds.h b/net/rds/rds.h
> index 966d2ee..39518ef 100644
> --- a/net/rds/rds.h
> +++ b/net/rds/rds.h
> @@ -903,7 +903,7 @@ void rds_connect_path_complete(struct rds_conn_path
> *conn, int curr);
> void rds_connect_complete(struct rds_connection *conn);
>
> /* transport.c */
> -int rds_trans_register(struct rds_transport *trans);
> +void rds_trans_register(struct rds_transport *trans);
> void rds_trans_unregister(struct rds_transport *trans);
> struct rds_transport *rds_trans_get_preferred(struct net *net, __be32 addr);
> void rds_trans_put(struct rds_transport *trans);
> diff --git a/net/rds/tcp.c b/net/rds/tcp.c
> index 5438f67..a973d3b 100644
> --- a/net/rds/tcp.c
> +++ b/net/rds/tcp.c
> @@ -652,16 +652,12 @@ static int rds_tcp_init(void)
> if (ret)
> goto out_pernet;
>
> - ret = rds_trans_register(&rds_tcp_transport);
> - if (ret)
> - goto out_recv;
> + rds_trans_register(&rds_tcp_transport);
>
> rds_info_register_func(RDS_INFO_TCP_SOCKETS, rds_tcp_tc_info);
>
> goto out;
>
> -out_recv:
> - rds_tcp_recv_exit();
> out_pernet:
> unregister_pernet_subsys(&rds_tcp_net_ops);
> out_notifier:
> diff --git a/net/rds/transport.c b/net/rds/transport.c
> index 2ffd3e3..0b188dd 100644
> --- a/net/rds/transport.c
> +++ b/net/rds/transport.c
> @@ -40,7 +40,7 @@
> static struct rds_transport *transports[RDS_TRANS_COUNT];
> static DECLARE_RWSEM(rds_trans_sem);
>
> -int rds_trans_register(struct rds_transport *trans)
> +void rds_trans_register(struct rds_transport *trans)
> {
> BUG_ON(strlen(trans->t_name) + 1 > TRANSNAMSIZ);
>
> @@ -55,8 +55,6 @@ int rds_trans_register(struct rds_transport *trans)
> }
>
> up_write(&rds_trans_sem);
> -
> - return 0;
> }
> EXPORT_SYMBOL_GPL(rds_trans_register);
Reviewed-by: Yuval Shaia <yuval.sh...@oracle.com>
>
> --
> 2.7.4
>
