2018-08-07 11:34:35

by zhong jiang

[permalink] [raw]
Subject: [PATCH 0/3] net: remove unneeded variable for return value


zhong jiang (3):
net:svc_rdma_transport: remove unneeded variable 'ret' in
rdma_listen_handler
net:af_iucv: get rid of the unneeded variable 'err' in
afiucv_pm_freeze
net:mod: remove unneeded variable 'ret' in init_p9

net/9p/mod.c | 4 +---
net/iucv/af_iucv.c | 3 +--
net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +--
3 files changed, 3 insertions(+), 7 deletions(-)

--
1.7.12.4



2018-08-07 11:33:50

by zhong jiang

[permalink] [raw]
Subject: [PATCH 1/3] net:svc_rdma_transport: remove unneeded variable 'ret' in rdma_listen_handler

The ret is not modified after initalization, So just remove the variable
and return 0.

Signed-off-by: zhong jiang <[email protected]>
---
net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 547b2cd..2848caf 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -296,7 +296,6 @@ static int rdma_listen_handler(struct rdma_cm_id *cma_id,
struct rdma_cm_event *event)
{
struct sockaddr *sap = (struct sockaddr *)&cma_id->route.addr.src_addr;
- int ret = 0;

trace_svcrdma_cm_event(event, sap);

@@ -315,7 +314,7 @@ static int rdma_listen_handler(struct rdma_cm_id *cma_id,
break;
}

- return ret;
+ return 0;
}

static int rdma_cma_handler(struct rdma_cm_id *cma_id,
--
1.7.12.4


2018-08-07 11:34:22

by zhong jiang

[permalink] [raw]
Subject: [PATCH 2/3] net:af_iucv: get rid of the unneeded variable 'err' in afiucv_pm_freeze

We will not use the variable 'err' after initalization, So remove it and
return 0.

Signed-off-by: zhong jiang <[email protected]>
---
net/iucv/af_iucv.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 92ee91e..a21d8ed 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -150,7 +150,6 @@ static int afiucv_pm_freeze(struct device *dev)
{
struct iucv_sock *iucv;
struct sock *sk;
- int err = 0;

#ifdef CONFIG_PM_DEBUG
printk(KERN_WARNING "afiucv_pm_freeze\n");
@@ -175,7 +174,7 @@ static int afiucv_pm_freeze(struct device *dev)
skb_queue_purge(&iucv->backlog_skb_q);
}
read_unlock(&iucv_sk_list.lock);
- return err;
+ return 0;
}

/**
--
1.7.12.4


2018-08-07 11:35:04

by zhong jiang

[permalink] [raw]
Subject: [PATCH 3/3] net:mod: remove unneeded variable 'ret' in init_p9

The ret is modified after initalization, so just remove it and
return 0.

Signed-off-by: zhong jiang <[email protected]>
---
net/9p/mod.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net/9p/mod.c b/net/9p/mod.c
index eb9777f..253ba82 100644
--- a/net/9p/mod.c
+++ b/net/9p/mod.c
@@ -171,13 +171,11 @@ void v9fs_put_trans(struct p9_trans_module *m)
*/
static int __init init_p9(void)
{
- int ret = 0;
-
p9_error_init();
pr_info("Installing 9P2000 support\n");
p9_trans_fd_init();

- return ret;
+ return 0;
}

/**
--
1.7.12.4


2018-08-07 16:26:30

by Anna Schumaker

[permalink] [raw]
Subject: Re: [PATCH 1/3] net:svc_rdma_transport: remove unneeded variable 'ret' in rdma_listen_handler

(Adding Bruce since he takes nfs / sunrpc server patches)

On 08/07/2018 07:20 AM, zhong jiang wrote:
> The ret is not modified after initalization, So just remove the variable
> and return 0.
>
> Signed-off-by: zhong jiang <[email protected]>
> ---
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> index 547b2cd..2848caf 100644
> --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
> +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> @@ -296,7 +296,6 @@ static int rdma_listen_handler(struct rdma_cm_id *cma_id,
> struct rdma_cm_event *event)
> {
> struct sockaddr *sap = (struct sockaddr *)&cma_id->route.addr.src_addr;
> - int ret = 0;
>
> trace_svcrdma_cm_event(event, sap);
>
> @@ -315,7 +314,7 @@ static int rdma_listen_handler(struct rdma_cm_id *cma_id,
> break;
> }
>
> - return ret;
> + return 0;
> }
>
> static int rdma_cma_handler(struct rdma_cm_id *cma_id,
>

2018-08-08 16:42:38

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 2/3] net:af_iucv: get rid of the unneeded variable 'err' in afiucv_pm_freeze

From: zhong jiang <[email protected]>
Date: Tue, 7 Aug 2018 19:20:08 +0800

> We will not use the variable 'err' after initalization, So remove it and
> return 0.
>
> Signed-off-by: zhong jiang <[email protected]>
>
Applied to net-next.

2018-08-08 16:43:19

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 3/3] net:mod: remove unneeded variable 'ret' in init_p9

From: zhong jiang <[email protected]>
Date: Tue, 7 Aug 2018 19:20:09 +0800

> The ret is modified after initalization, so just remove it and
> return 0.
>
> Signed-off-by: zhong jiang <[email protected]>

Applied to net-next

2018-08-09 20:07:52

by J. Bruce Fields

[permalink] [raw]
Subject: Re: [PATCH 1/3] net:svc_rdma_transport: remove unneeded variable 'ret' in rdma_listen_handler

On Tue, Aug 07, 2018 at 10:49:11AM -0400, Anna Schumaker wrote:
> (Adding Bruce since he takes nfs / sunrpc server patches)

Applied, thanks.--b.

>
> On 08/07/2018 07:20 AM, zhong jiang wrote:
> > The ret is not modified after initalization, So just remove the variable
> > and return 0.
> >
> > Signed-off-by: zhong jiang <[email protected]>
> > ---
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> > index 547b2cd..2848caf 100644
> > --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
> > +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> > @@ -296,7 +296,6 @@ static int rdma_listen_handler(struct rdma_cm_id *cma_id,
> > struct rdma_cm_event *event)
> > {
> > struct sockaddr *sap = (struct sockaddr *)&cma_id->route.addr.src_addr;
> > - int ret = 0;
> >
> > trace_svcrdma_cm_event(event, sap);
> >
> > @@ -315,7 +314,7 @@ static int rdma_listen_handler(struct rdma_cm_id *cma_id,
> > break;
> > }
> >
> > - return ret;
> > + return 0;
> > }
> >
> > static int rdma_cma_handler(struct rdma_cm_id *cma_id,
> >