public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Julia Lawall <julia.lawall@lip6.fr>
To: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>,
	kernel-janitors@vger.kernel.org, linux-wimax@intel.com,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/13 v2] wimax/i2400m: make return of 0 explicit
Date: Tue, 20 May 2014 08:44:49 +0800 (SGT)	[thread overview]
Message-ID: <alpine.DEB.2.10.1405200844010.2723@hadrien> (raw)
In-Reply-To: <5379FD39.7020605@cogentembedded.com>

From: Julia Lawall <Julia.Lawall@lip6.fr>

Delete unnecessary local variable whose value is always 0 and that hides
the fact that the result is always 0.

A simplified version of the semantic patch that fixes this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
local idexpression ret;
expression e;
position p;
@@

-ret = 0;
... when != ret = e
return
- ret
+ 0
  ;
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
Alternatively, is an error code wanted under the if?

v2: remove the use of 0 as an argument in the call to d_fnend

 drivers/net/wimax/i2400m/driver.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c
index 9c34d2f..9c78090 100644
--- a/drivers/net/wimax/i2400m/driver.c
+++ b/drivers/net/wimax/i2400m/driver.c
@@ -500,26 +500,23 @@ int i2400m_pm_notifier(struct notifier_block *notifier,
  */
 int i2400m_pre_reset(struct i2400m *i2400m)
 {
-	int result;
 	struct device *dev = i2400m_dev(i2400m);

 	d_fnstart(3, dev, "(i2400m %p)\n", i2400m);
 	d_printf(1, dev, "pre-reset shut down\n");

-	result = 0;
 	mutex_lock(&i2400m->init_mutex);
 	if (i2400m->updown) {
 		netif_tx_disable(i2400m->wimax_dev.net_dev);
 		__i2400m_dev_stop(i2400m);
-		result = 0;
 		/* down't set updown to zero -- this way
 		 * post_reset can restore properly */
 	}
 	mutex_unlock(&i2400m->init_mutex);
 	if (i2400m->bus_release)
 		i2400m->bus_release(i2400m);
-	d_fnend(3, dev, "(i2400m %p) = %d\n", i2400m, result);
-	return result;
+	d_fnend(3, dev, "(i2400m %p) = 0\n", i2400m);
+	return 0;
 }
 EXPORT_SYMBOL_GPL(i2400m_pre_reset);


  reply	other threads:[~2014-05-20  0:44 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-19  4:31 [PATCH 0/13] make return of 0 explicit Julia Lawall
2014-05-19  4:31 ` [PATCH 1/13] libertas: " Julia Lawall
2014-05-19  7:43   ` walter harms
2014-05-19 12:45   ` Sergei Shtylyov
2014-05-19 17:25     ` Dan Williams
2014-05-22 12:32       ` [PATCH] libertas: fix return value when processing invalid packet Dan Williams
2014-05-22 21:57         ` James Cameron
2014-05-20  0:30     ` [PATCH 1/13] libertas: make return of 0 explicit Julia Lawall
2014-05-20  0:36     ` Julia Lawall
2014-05-19  4:31 ` [PATCH 4/13] wimax/i2400m: " Julia Lawall
2014-05-19  7:47   ` walter harms
2014-05-19 11:30     ` Julia Lawall
2014-05-19 13:22       ` walter harms
2014-05-19 12:46   ` Sergei Shtylyov
2014-05-20  0:44     ` Julia Lawall [this message]
2014-05-21 21:19       ` [PATCH 4/13 v2] " David Miller
2014-05-19  4:31 ` [PATCH 6/13] [NETFILTER]: arp_tables: " Julia Lawall
2014-05-19  4:31 ` [PATCH 12/13] brcmsmac: " Julia Lawall

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.DEB.2.10.1405200844010.2723@hadrien \
    --to=julia.lawall@lip6.fr \
    --cc=inaky.perez-gonzalez@intel.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wimax@intel.com \
    --cc=netdev@vger.kernel.org \
    --cc=sergei.shtylyov@cogentembedded.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox