]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
wimax/i2400m: make return of 0 explicit
authorJulia Lawall <Julia.Lawall@lip6.fr>
Tue, 20 May 2014 00:44:49 +0000 (08:44 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 May 2014 21:16:24 +0000 (17:16 -0400)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wimax/i2400m/driver.c

index 9c34d2fccfac61508705a4021f436e9a9024e936..9c78090e72f87dae118dff22fd366d5ce11bacd8 100644 (file)
@@ -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);