staging: wilc1000: Merge assignment with return

Instead of storing the return value into a variable and then returning it, we
can club the two into a single return statement. This change was made using
the following semantic patch by Coccinelle:

@@
local idexpression ret;
expression e;
@@

-ret =
+return
     e;
-return ret;

Signed-off-by: Rehas Sachdeva <aquannie@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index d0cb568c94b18b46e312ab02239201ece11481d3..78f5613e9467cf5579a57f6d13137af9f5e1d5b9 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3279,7 +3279,6 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
 int wilc_hif_set_cfg(struct wilc_vif *vif,
                     struct cfg_param_attr *cfg_param)
 {
-       int result = 0;
        struct host_if_msg msg;
        struct host_if_drv *hif_drv = vif->hif_drv;
 
@@ -3293,9 +3292,7 @@ int wilc_hif_set_cfg(struct wilc_vif *vif,
        msg.body.cfg_info = *cfg_param;
        msg.vif = vif;
 
-       result = wilc_enqueue_cmd(&msg);
-
-       return result;
+       return wilc_enqueue_cmd(&msg);
 }
 
 static void GetPeriodicRSSI(unsigned long arg)

diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c
index 0f8d62594beebb06d52ff7074ade98a776583dba..f6c47cab23b9c573784f74a0de4c4dcc9152d662 100644 (file)
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -410,8 +410,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
        if (len2 > ARRAY_SIZE(wb)) {
                dev_err(&spi->dev, "spi buffer size too small (%d) (%zu)\n",
                         len2, ARRAY_SIZE(wb));
-               result = N_FAIL;
-               return result;
+               return N_FAIL;
        }
        /* zero spi write buffers. */
        for (wix = len; wix < len2; wix++)

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 19a580939dfc09d0f122a3fe8515f4d172542176..2b307ce0a9bb2747946b4b513c7c429a337db5ef 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1001,8 +1001,7 @@ int wilc_wlan_start(struct wilc *wilc)
        ret = wilc->hif_func->hif_write_reg(wilc, WILC_VMM_CORE_CFG, reg);
        if (!ret) {
                release_bus(wilc, RELEASE_ONLY);
-               ret = -EIO;
-               return ret;
+               return -EIO;
        }
        reg = 0;
        if (wilc->io_type == HIF_SDIO && wilc->dev_irq_num)