staging: wilc1000: return zero on success and non-zero on function failure

Some of the HIF layer API's return zero for failure and non-zero for
success condition. Now, modified the functions to return zero for success
and non-zero for failure as its recommended approach suggested in [1].

1. https://lore.kernel.org/driverdev-devel/20191113183322.a54mh2w6dulklgsd@kili.mountain/

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Link: https://lore.kernel.org/r/20200123182129.4053-1-ajay.kathat@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/netdev.c b/drivers/staging/wilc1000/netdev.c
index 960dbc8..0f48e74 100644 (file)
--- a/drivers/staging/wilc1000/netdev.c
+++ b/drivers/staging/wilc1000/netdev.c
@@ -183,7 +183,7 @@ static int wilc_wlan_get_firmware(struct net_device *dev)
 {
        struct wilc_vif *vif = netdev_priv(dev);
        struct wilc *wilc = vif->wilc;
-       int chip_id, ret = 0;
+       int chip_id;
        const struct firmware *wilc_firmware;
        char *firmware;
 
@@ -198,14 +198,11 @@ static int wilc_wlan_get_firmware(struct net_device *dev)
 
        if (request_firmware(&wilc_firmware, firmware, wilc->dev) != 0) {
                netdev_err(dev, "%s - firmware not available\n", firmware);
-               ret = -1;
-               goto fail;
+               return -EINVAL;
        }
        wilc->firmware = wilc_firmware;
 
-fail:
-
-       return ret;
+       return 0;
 }
 
 static int wilc_start_firmware(struct net_device *dev)
@@ -215,7 +212,7 @@ static int wilc_start_firmware(struct net_device *dev)
        int ret = 0;
 
        ret = wilc_wlan_start(wilc);
-       if (ret < 0)
+       if (ret)
                return ret;
 
        if (!wait_for_completion_timeout(&wilc->sync_event,
@@ -238,7 +235,7 @@ static int wilc1000_firmware_download(struct net_device *dev)
 
        ret = wilc_wlan_firmware_download(wilc, wilc->firmware->data,
                                          wilc->firmware->size);
-       if (ret < 0)
+       if (ret)
                return ret;
 
        release_firmware(wilc->firmware);
@@ -417,7 +414,7 @@ static int wilc_init_fw_config(struct net_device *dev, struct wilc_vif *vif)
        return 0;
 
 fail:
-       return -1;
+       return -EINVAL;
 }
 
 static void wlan_deinitialize_threads(struct net_device *dev)
@@ -497,14 +494,12 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif)
                wl->close = 0;
 
                ret = wilc_wlan_init(dev);
-               if (ret < 0)
-                       return -EIO;
+               if (ret)
+                       return ret;
 
                ret = wlan_initialize_threads(dev);
-               if (ret < 0) {
-                       ret = -EIO;
+               if (ret)
                        goto fail_wilc_wlan;
-               }
 
                if (wl->gpio_irq && init_irq(dev)) {
                        ret = -EIO;
@@ -518,22 +513,17 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif)
                        goto fail_irq_init;
                }
 
-               if (wilc_wlan_get_firmware(dev)) {
-                       ret = -EIO;
+               ret = wilc_wlan_get_firmware(dev);
+               if (ret)
                        goto fail_irq_enable;
-               }
 
                ret = wilc1000_firmware_download(dev);
-               if (ret < 0) {
-                       ret = -EIO;
+               if (ret)
                        goto fail_irq_enable;
-               }
 
                ret = wilc_start_firmware(dev);
-               if (ret < 0) {
-                       ret = -EIO;
+               if (ret)
                        goto fail_irq_enable;
-               }
 
                if (wilc_wlan_cfg_get(vif, 1, WID_FIRMWARE_VERSION, 1, 0)) {
                        int size;
@@ -545,11 +535,10 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif)
                        firmware_ver[size] = '\0';
                        netdev_dbg(dev, "Firmware Ver = %s\n", firmware_ver);
                }
-               ret = wilc_init_fw_config(dev, vif);
 
-               if (ret < 0) {
+               ret = wilc_init_fw_config(dev, vif);
+               if (ret) {
                        netdev_err(dev, "Failed to configure firmware\n");
-                       ret = -EIO;
                        goto fail_fw_start;
                }
                wl->initialized = true;
@@ -600,11 +589,11 @@ static int wilc_mac_open(struct net_device *ndev)
        netdev_dbg(ndev, "MAC OPEN[%p]\n", ndev);
 
        ret = wilc_init_host_int(ndev);
-       if (ret < 0)
+       if (ret)
                return ret;
 
        ret = wilc_wlan_initialize(ndev, vif);
-       if (ret < 0) {
+       if (ret) {
                wilc_deinit_host_int(ndev);
                return ret;
        }

diff --git a/drivers/staging/wilc1000/sdio.c b/drivers/staging/wilc1000/sdio.c
index 319e039..ca99335 100644 (file)
--- a/drivers/staging/wilc1000/sdio.c
+++ b/drivers/staging/wilc1000/sdio.c
@@ -273,7 +273,7 @@ static int wilc_sdio_set_func0_csa_address(struct wilc *wilc, u32 adr)
        ret = wilc_sdio_cmd52(wilc, &cmd);
        if (ret) {
                dev_err(&func->dev, "Failed cmd52, set 0x10c data...\n");
-               goto fail;
+               return ret;
        }
 
        cmd.address = 0x10d;
@@ -281,7 +281,7 @@ static int wilc_sdio_set_func0_csa_address(struct wilc *wilc, u32 adr)
        ret = wilc_sdio_cmd52(wilc, &cmd);
        if (ret) {
                dev_err(&func->dev, "Failed cmd52, set 0x10d data...\n");
-               goto fail;
+               return ret;
        }
 
        cmd.address = 0x10e;
@@ -289,11 +289,9 @@ static int wilc_sdio_set_func0_csa_address(struct wilc *wilc, u32 adr)
        ret = wilc_sdio_cmd52(wilc, &cmd);
        if (ret) {
                dev_err(&func->dev, "Failed cmd52, set 0x10e data...\n");
-               goto fail;
+               return ret;
        }
 
-       return 1;
-fail:
        return 0;
 }
 
@@ -311,7 +309,7 @@ static int wilc_sdio_set_func0_block_size(struct wilc *wilc, u32 block_size)
        ret = wilc_sdio_cmd52(wilc, &cmd);
        if (ret) {
                dev_err(&func->dev, "Failed cmd52, set 0x10 data...\n");
-               goto fail;
+               return ret;
        }
 
        cmd.address = 0x11;
@@ -319,11 +317,9 @@ static int wilc_sdio_set_func0_block_size(struct wilc *wilc, u32 block_size)
        ret = wilc_sdio_cmd52(wilc, &cmd);
        if (ret) {
                dev_err(&func->dev, "Failed cmd52, set 0x11 data...\n");
-               goto fail;
+               return ret;
        }
 
-       return 1;
-fail:
        return 0;
 }
 
@@ -347,18 +343,16 @@ static int wilc_sdio_set_func1_block_size(struct wilc *wilc, u32 block_size)
        ret = wilc_sdio_cmd52(wilc, &cmd);
        if (ret) {
                dev_err(&func->dev, "Failed cmd52, set 0x110 data...\n");
-               goto fail;
+               return ret;
        }
        cmd.address = 0x111;
        cmd.data = (u8)(block_size >> 8);
        ret = wilc_sdio_cmd52(wilc, &cmd);
        if (ret) {
                dev_err(&func->dev, "Failed cmd52, set 0x111 data...\n");
-               goto fail;
+               return ret;
        }
 
-       return 1;
-fail:
        return 0;
 }
 
@@ -384,19 +378,18 @@ static int wilc_sdio_write_reg(struct wilc *wilc, u32 addr, u32 data)
                cmd.address = addr;
                cmd.data = data;
                ret = wilc_sdio_cmd52(wilc, &cmd);
-               if (ret) {
+               if (ret)
                        dev_err(&func->dev,
                                "Failed cmd 52, read reg (%08x) ...\n", addr);
-                       goto fail;
-               }
        } else {
                struct sdio_cmd53 cmd;
 
                /**
                 *      set the AHB address
                 **/
-               if (!wilc_sdio_set_func0_csa_address(wilc, addr))
-                       goto fail;
+               ret = wilc_sdio_set_func0_csa_address(wilc, addr);
+               if (ret)
+                       return ret;
 
                cmd.read_write = 1;
                cmd.function = 0;
@@ -407,18 +400,12 @@ static int wilc_sdio_write_reg(struct wilc *wilc, u32 addr, u32 data)
                cmd.buffer = (u8 *)&data;
                cmd.block_size = sdio_priv->block_size;
                ret = wilc_sdio_cmd53(wilc, &cmd);
-               if (ret) {
+               if (ret)
                        dev_err(&func->dev,
                                "Failed cmd53, write reg (%08x)...\n", addr);
-                       goto fail;
-               }
        }
 
-       return 1;
-
-fail:
-
-       return 0;
+       return ret;
 }
 
 static int wilc_sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
@@ -470,14 +457,15 @@ static int wilc_sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
                cmd.buffer = buf;
                cmd.block_size = block_size;
                if (addr > 0) {
-                       if (!wilc_sdio_set_func0_csa_address(wilc, addr))
-                               goto fail;
+                       ret = wilc_sdio_set_func0_csa_address(wilc, addr);
+                       if (ret)
+                               return ret;
                }
                ret = wilc_sdio_cmd53(wilc, &cmd);
                if (ret) {
                        dev_err(&func->dev,
                                "Failed cmd53 [%x], block send...\n", addr);
-                       goto fail;
+                       return ret;
                }
                if (addr > 0)
                        addr += nblk * block_size;
@@ -493,21 +481,18 @@ static int wilc_sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
                cmd.block_size = block_size;
 
                if (addr > 0) {
-                       if (!wilc_sdio_set_func0_csa_address(wilc, addr))
-                               goto fail;
+                       ret = wilc_sdio_set_func0_csa_address(wilc, addr);
+                       if (ret)
+                               return ret;
                }
                ret = wilc_sdio_cmd53(wilc, &cmd);
                if (ret) {
                        dev_err(&func->dev,
                                "Failed cmd53 [%x], bytes send...\n", addr);
-                       goto fail;
+                       return ret;
                }
        }
 
-       return 1;
-
-fail:
-
        return 0;
 }
 
@@ -528,14 +513,15 @@ static int wilc_sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data)
                if (ret) {
                        dev_err(&func->dev,
                                "Failed cmd 52, read reg (%08x) ...\n", addr);
-                       goto fail;
+                       return ret;
                }
                *data = cmd.data;
        } else {
                struct sdio_cmd53 cmd;
 
-               if (!wilc_sdio_set_func0_csa_address(wilc, addr))
-                       goto fail;
+               ret = wilc_sdio_set_func0_csa_address(wilc, addr);
+               if (ret)
+                       return ret;
 
                cmd.read_write = 0;
                cmd.function = 0;
@@ -550,16 +536,11 @@ static int wilc_sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data)
                if (ret) {
                        dev_err(&func->dev,
                                "Failed cmd53, read reg (%08x)...\n", addr);
-                       goto fail;
+                       return ret;
                }
        }
 
        le32_to_cpus(data);
-
-       return 1;
-
-fail:
-
        return 0;
 }
 
@@ -612,14 +593,15 @@ static int wilc_sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
                cmd.buffer = buf;
                cmd.block_size = block_size;
                if (addr > 0) {
-                       if (!wilc_sdio_set_func0_csa_address(wilc, addr))
-                               goto fail;
+                       ret = wilc_sdio_set_func0_csa_address(wilc, addr);
+                       if (ret)
+                               return ret;
                }
                ret = wilc_sdio_cmd53(wilc, &cmd);
                if (ret) {
                        dev_err(&func->dev,
                                "Failed cmd53 [%x], block read...\n", addr);
-                       goto fail;
+                       return ret;
                }
                if (addr > 0)
                        addr += nblk * block_size;
@@ -635,21 +617,18 @@ static int wilc_sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
                cmd.block_size = block_size;
 
                if (addr > 0) {
-                       if (!wilc_sdio_set_func0_csa_address(wilc, addr))
-                               goto fail;
+                       ret = wilc_sdio_set_func0_csa_address(wilc, addr);
+                       if (ret)
+                               return ret;
                }
                ret = wilc_sdio_cmd53(wilc, &cmd);
                if (ret) {
                        dev_err(&func->dev,
                                "Failed cmd53 [%x], bytes read...\n", addr);
-                       goto fail;
+                       return ret;
                }
        }
 
-       return 1;
-
-fail:
-
        return 0;
 }
 
@@ -661,7 +640,7 @@ fail:
 
 static int wilc_sdio_deinit(struct wilc *wilc)
 {
-       return 1;
+       return 0;
 }
 
 static int wilc_sdio_init(struct wilc *wilc, bool resume)
@@ -686,15 +665,16 @@ static int wilc_sdio_init(struct wilc *wilc, bool resume)
        ret = wilc_sdio_cmd52(wilc, &cmd);
        if (ret) {
                dev_err(&func->dev, "Fail cmd 52, enable csa...\n");
-               goto fail;
+               return ret;
        }
 
        /**
         *      function 0 block size
         **/
-       if (!wilc_sdio_set_func0_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) {
+       ret = wilc_sdio_set_func0_block_size(wilc, WILC_SDIO_BLOCK_SIZE);
+       if (ret) {
                dev_err(&func->dev, "Fail cmd 52, set func 0 block size...\n");
-               goto fail;
+               return ret;
        }
        sdio_priv->block_size = WILC_SDIO_BLOCK_SIZE;
 
@@ -710,7 +690,7 @@ static int wilc_sdio_init(struct wilc *wilc, bool resume)
        if (ret) {
                dev_err(&func->dev,
                        "Fail cmd 52, set IOE register...\n");
-               goto fail;
+               return ret;
        }
 
        /**
@@ -727,7 +707,7 @@ static int wilc_sdio_init(struct wilc *wilc, bool resume)
                if (ret) {
                        dev_err(&func->dev,
                                "Fail cmd 52, get IOR register...\n");
-                       goto fail;
+                       return ret;
                }
                if (cmd.data == 0x2)
                        break;
@@ -735,15 +715,16 @@ static int wilc_sdio_init(struct wilc *wilc, bool resume)
 
        if (loop <= 0) {
                dev_err(&func->dev, "Fail func 1 is not ready...\n");
-               goto fail;
+               return -EINVAL;
        }
 
        /**
         *      func 1 is ready, set func 1 block size
         **/
-       if (!wilc_sdio_set_func1_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) {
+       ret = wilc_sdio_set_func1_block_size(wilc, WILC_SDIO_BLOCK_SIZE);
+       if (ret) {
                dev_err(&func->dev, "Fail set func 1 block size...\n");
-               goto fail;
+               return ret;
        }
 
        /**
@@ -757,16 +738,17 @@ static int wilc_sdio_init(struct wilc *wilc, bool resume)
        ret = wilc_sdio_cmd52(wilc, &cmd);
        if (ret) {
                dev_err(&func->dev, "Fail cmd 52, set IEN register...\n");
-               goto fail;
+               return ret;
        }
 
        /**
         *      make sure can read back chip id correctly
         **/
        if (!resume) {
-               if (!wilc_sdio_read_reg(wilc, 0x1000, &chipid)) {
+               ret = wilc_sdio_read_reg(wilc, 0x1000, &chipid);
+               if (ret) {
                        dev_err(&func->dev, "Fail cmd read chip id...\n");
-                       goto fail;
+                       return ret;
                }
                dev_err(&func->dev, "chipid (%08x)\n", chipid);
                if ((chipid & 0xfff) > 0x2a0)
@@ -777,10 +759,6 @@ static int wilc_sdio_init(struct wilc *wilc, bool resume)
                         sdio_priv->has_thrpt_enh3);
        }
 
-       return 1;
-
-fail:
-
        return 0;
 }
 
@@ -806,7 +784,7 @@ static int wilc_sdio_read_size(struct wilc *wilc, u32 *size)
        tmp |= (cmd.data << 8);
 
        *size = tmp;
-       return 1;
+       return 0;
 }
 
 static int wilc_sdio_read_int(struct wilc *wilc, u32 *int_status)
@@ -865,7 +843,7 @@ static int wilc_sdio_read_int(struct wilc *wilc, u32 *int_status)
 
        *int_status = tmp;
 
-       return 1;
+       return 0;
 }
 
 static int wilc_sdio_clear_int_ext(struct wilc *wilc, u32 val)
@@ -909,10 +887,10 @@ static int wilc_sdio_clear_int_ext(struct wilc *wilc, u32 val)
                                dev_err(&func->dev,
                                        "Failed cmd52, set 0xf8 data (%d) ...\n",
                                        __LINE__);
-                               goto fail;
+                               return ret;
                        }
                }
-               return 1;
+               return 0;
        }
        if (sdio_priv->irq_gpio) {
                /* has_thrpt_enh2 uses register 0xf8 to clear interrupts. */
@@ -926,7 +904,6 @@ static int wilc_sdio_clear_int_ext(struct wilc *wilc, u32 val)
                if (flags) {
                        int i;
 
-                       ret = 1;
                        for (i = 0; i < sdio_priv->nint; i++) {
                                if (flags & 1) {
                                        struct sdio_cmd52 cmd;
@@ -942,15 +919,12 @@ static int wilc_sdio_clear_int_ext(struct wilc *wilc, u32 val)
                                                dev_err(&func->dev,
                                                        "Failed cmd52, set 0xf8 data (%d) ...\n",
                                                        __LINE__);
-                                               goto fail;
+                                               return ret;
                                        }
                                }
-                               if (!ret)
-                                       break;
                                flags >>= 1;
                        }
-                       if (!ret)
-                               goto fail;
+
                        for (i = sdio_priv->nint; i < MAX_NUM_INT; i++) {
                                if (flags & 1)
                                        dev_err(&func->dev,
@@ -985,11 +959,9 @@ static int wilc_sdio_clear_int_ext(struct wilc *wilc, u32 val)
                        dev_err(&func->dev,
                                "Failed cmd52, set 0xf6 data (%d) ...\n",
                                __LINE__);
-                       goto fail;
+                       return ret;
                }
        }
-       return 1;
-fail:
        return 0;
 }
 
@@ -1001,12 +973,12 @@ static int wilc_sdio_sync_ext(struct wilc *wilc, int nint)
 
        if (nint > MAX_NUM_INT) {
                dev_err(&func->dev, "Too many interrupts (%d)...\n", nint);
-               return 0;
+               return -EINVAL;
        }
        if (nint > MAX_NUN_INT_THRPT_ENH2) {
                dev_err(&func->dev,
                        "Cannot support more than 5 interrupts when has_thrpt_enh2=1.\n");
-               return 0;
+               return -EINVAL;
        }
 
        sdio_priv->nint = nint;
@@ -1014,15 +986,15 @@ static int wilc_sdio_sync_ext(struct wilc *wilc, int nint)
        /**
         *      Disable power sequencer
         **/
-       if (!wilc_sdio_read_reg(wilc, WILC_MISC, &reg)) {
+       if (wilc_sdio_read_reg(wilc, WILC_MISC, &reg)) {
                dev_err(&func->dev, "Failed read misc reg...\n");
-               return 0;
+               return -EINVAL;
        }
 
        reg &= ~BIT(8);
-       if (!wilc_sdio_write_reg(wilc, WILC_MISC, reg)) {
+       if (wilc_sdio_write_reg(wilc, WILC_MISC, reg)) {
                dev_err(&func->dev, "Failed write misc reg...\n");
-               return 0;
+               return -EINVAL;
        }
 
        if (sdio_priv->irq_gpio) {
@@ -1033,59 +1005,59 @@ static int wilc_sdio_sync_ext(struct wilc *wilc, int nint)
                 *      interrupt pin mux select
                 **/
                ret = wilc_sdio_read_reg(wilc, WILC_PIN_MUX_0, &reg);
-               if (!ret) {
+               if (ret) {
                        dev_err(&func->dev, "Failed read reg (%08x)...\n",
                                WILC_PIN_MUX_0);
-                       return 0;
+                       return ret;
                }
                reg |= BIT(8);
                ret = wilc_sdio_write_reg(wilc, WILC_PIN_MUX_0, reg);
-               if (!ret) {
+               if (ret) {
                        dev_err(&func->dev, "Failed write reg (%08x)...\n",
                                WILC_PIN_MUX_0);
-                       return 0;
+                       return ret;
                }
 
                /**
                 *      interrupt enable
                 **/
                ret = wilc_sdio_read_reg(wilc, WILC_INTR_ENABLE, &reg);
-               if (!ret) {
+               if (ret) {
                        dev_err(&func->dev, "Failed read reg (%08x)...\n",
                                WILC_INTR_ENABLE);
-                       return 0;
+                       return ret;
                }
 
                for (i = 0; (i < 5) && (nint > 0); i++, nint--)
                        reg |= BIT((27 + i));
                ret = wilc_sdio_write_reg(wilc, WILC_INTR_ENABLE, reg);
-               if (!ret) {
+               if (ret) {
                        dev_err(&func->dev, "Failed write reg (%08x)...\n",
                                WILC_INTR_ENABLE);
-                       return 0;
+                       return ret;
                }
                if (nint) {
                        ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
-                       if (!ret) {
+                       if (ret) {
                                dev_err(&func->dev,
                                        "Failed read reg (%08x)...\n",
                                        WILC_INTR2_ENABLE);
-                               return 0;
+                               return ret;
                        }
 
                        for (i = 0; (i < 3) && (nint > 0); i++, nint--)
                                reg |= BIT(i);
 
                        ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
-                       if (!ret) {
+                       if (ret) {
                                dev_err(&func->dev,
                                        "Failed write reg (%08x)...\n",
                                        WILC_INTR2_ENABLE);
-                               return 0;
+                               return ret;
                        }
                }
        }
-       return 1;
+       return 0;
 }
 
 /* Global sdio HIF function table */

diff --git a/drivers/staging/wilc1000/spi.c b/drivers/staging/wilc1000/spi.c
index 4b883a9..3ffc7b4 100644 (file)
--- a/drivers/staging/wilc1000/spi.c
+++ b/drivers/staging/wilc1000/spi.c
@@ -88,11 +88,6 @@ static u8 crc7(u8 crc, const u8 *buffer, u32 len)
 #define CMD_SINGLE_READ                                0xca
 #define CMD_RESET                              0xcf
 
-#define N_OK                                   1
-#define N_FAIL                                 0
-#define N_RESET                                        -1
-#define N_RETRY                                        -2
-
 #define DATA_PKT_SZ_256                                256
 #define DATA_PKT_SZ_512                                512
 #define DATA_PKT_SZ_1K                         1024
@@ -299,7 +294,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
        u32 len2;
        u8 rsp;
        int len = 0;
-       int result = N_OK;
+       int result = 0;
        int retry;
        u8 crc[2];
 
@@ -387,11 +382,11 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
                break;
 
        default:
-               result = N_FAIL;
+               result = -EINVAL;
                break;
        }
 
-       if (result != N_OK)
+       if (result)
                return result;
 
        if (!spi_priv->crc_off)
@@ -424,7 +419,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));
-               return N_FAIL;
+               return -EINVAL;
        }
        /* zero spi write buffers. */
        for (wix = len; wix < len2; wix++)
@@ -433,7 +428,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
 
        if (wilc_spi_tx_rx(wilc, wb, rb, len2)) {
                dev_err(&spi->dev, "Failed cmd write, bus error...\n");
-               return N_FAIL;
+               return -EINVAL;
        }
 
        /*
@@ -448,7 +443,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
                dev_err(&spi->dev,
                        "Failed cmd response, cmd (%02x), resp (%02x)\n",
                        cmd, rsp);
-               return N_FAIL;
+               return -EINVAL;
        }
 
        /*
@@ -458,7 +453,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
        if (rsp != 0x00) {
                dev_err(&spi->dev, "Failed cmd state response state (%02x)\n",
                        rsp);
-               return N_FAIL;
+               return -EINVAL;
        }
 
        if (cmd == CMD_INTERNAL_READ || cmd == CMD_SINGLE_READ ||
@@ -485,7 +480,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
                if (retry <= 0) {
                        dev_err(&spi->dev,
                                "Error, data read response (%02x)\n", rsp);
-                       return N_RESET;
+                       return -EAGAIN;
                }
        }
 
@@ -501,7 +496,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
                } else {
                        dev_err(&spi->dev,
                                "buffer overrun when reading data.\n");
-                       return N_FAIL;
+                       return -EINVAL;
                }
 
                if (!spi_priv->crc_off) {
@@ -514,7 +509,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
                        } else {
                                dev_err(&spi->dev,
                                        "buffer overrun when reading crc.\n");
-                               return N_FAIL;
+                               return -EINVAL;
                        }
                }
        } else if ((cmd == CMD_DMA_READ) || (cmd == CMD_DMA_EXT_READ)) {
@@ -540,7 +535,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
                        if (wilc_spi_rx(wilc, &b[ix], nbytes)) {
                                dev_err(&spi->dev,
                                        "Failed block read, bus err\n");
-                               return N_FAIL;
+                               return -EINVAL;
                        }
 
                        /*
@@ -549,7 +544,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
                        if (!spi_priv->crc_off && wilc_spi_rx(wilc, crc, 2)) {
                                dev_err(&spi->dev,
                                        "Failed block crc read, bus err\n");
-                               return N_FAIL;
+                               return -EINVAL;
                        }
 
                        ix += nbytes;
@@ -581,14 +576,14 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
                                if (wilc_spi_rx(wilc, &rsp, 1)) {
                                        dev_err(&spi->dev,
                                                "Failed resp read, bus err\n");
-                                       result = N_FAIL;
+                                       result = -EINVAL;
                                        break;
                                }
                                if (((rsp >> 4) & 0xf) == 0xf)
                                        break;
                        } while (retry--);
 
-                       if (result == N_FAIL)
+                       if (result)
                                break;
 
                        /*
@@ -597,7 +592,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
                        if (wilc_spi_rx(wilc, &b[ix], nbytes)) {
                                dev_err(&spi->dev,
                                        "Failed block read, bus err\n");
-                               result = N_FAIL;
+                               result = -EINVAL;
                                break;
                        }
 
@@ -607,7 +602,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
                        if (!spi_priv->crc_off && wilc_spi_rx(wilc, crc, 2)) {
                                dev_err(&spi->dev,
                                        "Failed block crc read, bus err\n");
-                               result = N_FAIL;
+                               result = -EINVAL;
                                break;
                        }
 
@@ -623,7 +618,7 @@ static int spi_data_write(struct wilc *wilc, u8 *b, u32 sz)
        struct spi_device *spi = to_spi_device(wilc->dev);
        struct wilc_spi *spi_priv = wilc->bus_data;
        int ix, nbytes;
-       int result = 1;
+       int result = 0;
        u8 cmd, order, crc[2] = {0};
 
        /*
@@ -651,7 +646,7 @@ static int spi_data_write(struct wilc *wilc, u8 *b, u32 sz)
                if (wilc_spi_tx(wilc, &cmd, 1)) {
                        dev_err(&spi->dev,
                                "Failed data block cmd write, bus error...\n");
-                       result = N_FAIL;
+                       result = -EINVAL;
                        break;
                }
 
@@ -661,7 +656,7 @@ static int spi_data_write(struct wilc *wilc, u8 *b, u32 sz)
                if (wilc_spi_tx(wilc, &b[ix], nbytes)) {
                        dev_err(&spi->dev,
                                "Failed data block write, bus error...\n");
-                       result = N_FAIL;
+                       result = -EINVAL;
                        break;
                }
 
@@ -671,7 +666,7 @@ static int spi_data_write(struct wilc *wilc, u8 *b, u32 sz)
                if (!spi_priv->crc_off) {
                        if (wilc_spi_tx(wilc, crc, 2)) {
                                dev_err(&spi->dev, "Failed data block crc write, bus error...\n");
-                               result = N_FAIL;
+                               result = -EINVAL;
                                break;
                        }
                }
@@ -700,7 +695,7 @@ static int spi_internal_write(struct wilc *wilc, u32 adr, u32 dat)
        cpu_to_le32s(&dat);
        result = spi_cmd_complete(wilc, CMD_INTERNAL_WRITE, adr, (u8 *)&dat, 4,
                                  0);
-       if (result != N_OK)
+       if (result)
                dev_err(&spi->dev, "Failed internal write cmd...\n");
 
        return result;
@@ -713,14 +708,14 @@ static int spi_internal_read(struct wilc *wilc, u32 adr, u32 *data)
 
        result = spi_cmd_complete(wilc, CMD_INTERNAL_READ, adr, (u8 *)data, 4,
                                  0);
-       if (result != N_OK) {
+       if (result) {
                dev_err(&spi->dev, "Failed internal read cmd...\n");
-               return 0;
+               return result;
        }
 
        le32_to_cpus(data);
 
-       return 1;
+       return result;
 }
 
 /********************************************
@@ -744,7 +739,7 @@ static int wilc_spi_write_reg(struct wilc *wilc, u32 addr, u32 data)
        }
 
        result = spi_cmd_complete(wilc, cmd, addr, (u8 *)&data, 4, clockless);
-       if (result != N_OK)
+       if (result)
                dev_err(&spi->dev, "Failed cmd, write reg (%08x)...\n", addr);
 
        return result;
@@ -759,23 +754,23 @@ static int wilc_spi_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
         * has to be greated than 4
         */
        if (size <= 4)
-               return 0;
+               return -EINVAL;
 
        result = spi_cmd_complete(wilc, CMD_DMA_EXT_WRITE, addr, NULL, size, 0);
-       if (result != N_OK) {
+       if (result) {
                dev_err(&spi->dev,
                        "Failed cmd, write block (%08x)...\n", addr);
-               return 0;
+               return result;
        }
 
        /*
         * Data
         */
        result = spi_data_write(wilc, buf, size);
-       if (result != N_OK)
+       if (result)
                dev_err(&spi->dev, "Failed block data write...\n");
 
-       return 1;
+       return result;
 }
 
 static int wilc_spi_read_reg(struct wilc *wilc, u32 addr, u32 *data)
@@ -792,14 +787,14 @@ static int wilc_spi_read_reg(struct wilc *wilc, u32 addr, u32 *data)
        }
 
        result = spi_cmd_complete(wilc, cmd, addr, (u8 *)data, 4, clockless);
-       if (result != N_OK) {
+       if (result) {
                dev_err(&spi->dev, "Failed cmd, read reg (%08x)...\n", addr);
-               return 0;
+               return result;
        }
 
        le32_to_cpus(data);
 
-       return 1;
+       return 0;
 }
 
 static int wilc_spi_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
@@ -808,15 +803,13 @@ static int wilc_spi_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
        int result;
 
        if (size <= 4)
-               return 0;
+               return -EINVAL;
 
        result = spi_cmd_complete(wilc, CMD_DMA_EXT_READ, addr, buf, size, 0);
-       if (result != N_OK) {
+       if (result)
                dev_err(&spi->dev, "Failed cmd, read block (%08x)...\n", addr);
-               return 0;
-       }
 
-       return 1;
+       return result;
 }
 
 /********************************************
@@ -830,7 +823,7 @@ static int wilc_spi_deinit(struct wilc *wilc)
        /*
         * TODO:
         */
-       return 1;
+       return 0;
 }
 
 static int wilc_spi_init(struct wilc *wilc, bool resume)
@@ -840,13 +833,14 @@ static int wilc_spi_init(struct wilc *wilc, bool resume)
        u32 reg;
        u32 chipid;
        static int isinit;
+       int ret;
 
        if (isinit) {
-               if (!wilc_spi_read_reg(wilc, 0x1000, &chipid)) {
+               ret = wilc_spi_read_reg(wilc, 0x1000, &chipid);
+               if (ret)
                        dev_err(&spi->dev, "Fail cmd read chip id...\n");
-                       return 0;
-               }
-               return 1;
+
+               return ret;
        }
 
        /*
@@ -858,7 +852,8 @@ static int wilc_spi_init(struct wilc *wilc, bool resume)
         * way to reset
         */
        /* the SPI to it's initial value. */
-       if (!spi_internal_read(wilc, WILC_SPI_PROTOCOL_OFFSET, &reg)) {
+       ret = spi_internal_read(wilc, WILC_SPI_PROTOCOL_OFFSET, &reg);
+       if (ret) {
                /*
                 * Read failed. Try with CRC off. This might happen when module
                 * is removed but chip isn't reset
@@ -866,24 +861,26 @@ static int wilc_spi_init(struct wilc *wilc, bool resume)
                spi_priv->crc_off = 1;
                dev_err(&spi->dev,
                        "Failed read with CRC on, retrying with CRC off\n");
-               if (!spi_internal_read(wilc, WILC_SPI_PROTOCOL_OFFSET, &reg)) {
+               ret = spi_internal_read(wilc, WILC_SPI_PROTOCOL_OFFSET, &reg);
+               if (ret) {
                        /*
                         * Read failed with both CRC on and off,
                         * something went bad
                         */
                        dev_err(&spi->dev, "Failed internal read protocol\n");
-                       return 0;
+                       return ret;
                }
        }
        if (spi_priv->crc_off == 0) {
                reg &= ~0xc; /* disable crc checking */
                reg &= ~0x70;
                reg |= (0x5 << 4);
-               if (!spi_internal_write(wilc, WILC_SPI_PROTOCOL_OFFSET, reg)) {
+               ret = spi_internal_write(wilc, WILC_SPI_PROTOCOL_OFFSET, reg);
+               if (ret) {
                        dev_err(&spi->dev,
                                "[wilc spi %d]: Failed internal write reg\n",
                                __LINE__);
-                       return 0;
+                       return ret;
                }
                spi_priv->crc_off = 1;
        }
@@ -891,14 +888,15 @@ static int wilc_spi_init(struct wilc *wilc, bool resume)
        /*
         * make sure can read back chip id correctly
         */
-       if (!wilc_spi_read_reg(wilc, 0x1000, &chipid)) {
+       ret = wilc_spi_read_reg(wilc, 0x1000, &chipid);
+       if (ret) {
                dev_err(&spi->dev, "Fail cmd read chip id...\n");
-               return 0;
+               return ret;
        }
 
        isinit = 1;
 
-       return 1;
+       return 0;
 }
 
 static int wilc_spi_read_size(struct wilc *wilc, u32 *size)
@@ -930,7 +928,7 @@ static int wilc_spi_sync_ext(struct wilc *wilc, int nint)
 
        if (nint > MAX_NUM_INT) {
                dev_err(&spi->dev, "Too many interrupts (%d)...\n", nint);
-               return 0;
+               return -EINVAL;
        }
 
        spi_priv->nint = nint;
@@ -939,58 +937,58 @@ static int wilc_spi_sync_ext(struct wilc *wilc, int nint)
         * interrupt pin mux select
         */
        ret = wilc_spi_read_reg(wilc, WILC_PIN_MUX_0, &reg);
-       if (!ret) {
+       if (ret) {
                dev_err(&spi->dev, "Failed read reg (%08x)...\n",
                        WILC_PIN_MUX_0);
-               return 0;
+               return ret;
        }
        reg |= BIT(8);
        ret = wilc_spi_write_reg(wilc, WILC_PIN_MUX_0, reg);
-       if (!ret) {
+       if (ret) {
                dev_err(&spi->dev, "Failed write reg (%08x)...\n",
                        WILC_PIN_MUX_0);
-               return 0;
+               return ret;
        }
 
        /*
         * interrupt enable
         */
        ret = wilc_spi_read_reg(wilc, WILC_INTR_ENABLE, &reg);
-       if (!ret) {
+       if (ret) {
                dev_err(&spi->dev, "Failed read reg (%08x)...\n",
                        WILC_INTR_ENABLE);
-               return 0;
+               return ret;
        }
 
        for (i = 0; (i < 5) && (nint > 0); i++, nint--)
                reg |= (BIT((27 + i)));
 
        ret = wilc_spi_write_reg(wilc, WILC_INTR_ENABLE, reg);
-       if (!ret) {
+       if (ret) {
                dev_err(&spi->dev, "Failed write reg (%08x)...\n",
                        WILC_INTR_ENABLE);
-               return 0;
+               return ret;
        }
        if (nint) {
                ret = wilc_spi_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
-               if (!ret) {
+               if (ret) {
                        dev_err(&spi->dev, "Failed read reg (%08x)...\n",
                                WILC_INTR2_ENABLE);
-                       return 0;
+                       return ret;
                }
 
                for (i = 0; (i < 3) && (nint > 0); i++, nint--)
                        reg |= BIT(i);
 
                ret = wilc_spi_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
-               if (!ret) {
+               if (ret) {
                        dev_err(&spi->dev, "Failed write reg (%08x)...\n",
                                WILC_INTR2_ENABLE);
-                       return 0;
+                       return ret;
                }
        }
 
-       return 1;
+       return 0;
 }
 
 /* Global spi HIF function table */

diff --git a/drivers/staging/wilc1000/wlan.c b/drivers/staging/wilc1000/wlan.c
index c32af70..b904eda 100644 (file)
--- a/drivers/staging/wilc1000/wlan.c
+++ b/drivers/staging/wilc1000/wlan.c
@@ -534,7 +534,7 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_count)
        func = wilc->hif_func;
        do {
                ret = func->hif_read_reg(wilc, WILC_HOST_TX_CTRL, &reg);
-               if (!ret)
+               if (ret)
                        break;
 
                if ((reg & 0x1) == 0)
@@ -548,7 +548,7 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_count)
                }
        } while (!wilc->quit);
 
-       if (!ret)
+       if (ret)
                goto out_release_bus;
 
        timeout = 200;
@@ -557,16 +557,16 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_count)
                                         WILC_VMM_TBL_RX_SHADOW_BASE,
                                         (u8 *)vmm_table,
                                         ((i + 1) * 4));
-               if (!ret)
+               if (ret)
                        break;
 
                ret = func->hif_write_reg(wilc, WILC_HOST_VMM_CTL, 0x2);
-               if (!ret)
+               if (ret)
                        break;
 
                do {
                        ret = func->hif_read_reg(wilc, WILC_HOST_VMM_CTL, &reg);
-                       if (!ret)
+                       if (ret)
                                break;
                        if ((reg >> 2) & 0x1) {
                                entries = ((reg >> 3) & 0x3f);
@@ -579,19 +579,19 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_count)
                        break;
                }
 
-               if (!ret)
+               if (ret)
                        break;
 
                if (entries == 0) {
                        ret = func->hif_read_reg(wilc, WILC_HOST_TX_CTRL, &reg);
-                       if (!ret)
+                       if (ret)
                                break;
                        reg &= ~BIT(0);
                        ret = func->hif_write_reg(wilc, WILC_HOST_TX_CTRL, reg);
                }
        } while (0);
 
-       if (!ret)
+       if (ret)
                goto out_release_bus;
 
        if (entries == 0) {
@@ -654,7 +654,7 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_count)
        acquire_bus(wilc, WILC_BUS_ACQUIRE_AND_WAKEUP);
 
        ret = func->hif_clear_int_ext(wilc, ENABLE_TX_VMM);
-       if (!ret)
+       if (ret)
                goto out_release_bus;
 
        ret = func->hif_block_tx_ext(wilc, 0, txb, offset);
@@ -771,7 +771,7 @@ static void wilc_wlan_handle_isr_ext(struct wilc *wilc, u32 int_status)
 
        wilc->hif_func->hif_clear_int_ext(wilc, DATA_INT_CLR | ENABLE_RX_VMM);
        ret = wilc->hif_func->hif_block_rx_ext(wilc, 0, buffer, size);
-       if (!ret)
+       if (ret)
                return;
 
        offset += size;
@@ -832,7 +832,7 @@ int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer,
                        memcpy(dma_buffer, &buffer[offset], size2);
                        ret = wilc->hif_func->hif_block_tx(wilc, addr,
                                                           dma_buffer, size2);
-                       if (!ret)
+                       if (ret)
                                break;
 
                        addr += size2;
@@ -841,17 +841,15 @@ int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer,
                }
                release_bus(wilc, WILC_BUS_RELEASE_ONLY);
 
-               if (!ret) {
-                       ret = -EIO;
+               if (ret)
                        goto fail;
-               }
        } while (offset < buffer_size);
 
 fail:
 
        kfree(dma_buffer);
 
-       return (ret < 0) ? ret : 0;
+       return ret;
 }
 
 int wilc_wlan_start(struct wilc *wilc)
@@ -868,26 +866,26 @@ int wilc_wlan_start(struct wilc *wilc)
        }
        acquire_bus(wilc, WILC_BUS_ACQUIRE_ONLY);
        ret = wilc->hif_func->hif_write_reg(wilc, WILC_VMM_CORE_CFG, reg);
-       if (!ret) {
+       if (ret) {
                release_bus(wilc, WILC_BUS_RELEASE_ONLY);
-               return -EIO;
+               return ret;
        }
        reg = 0;
        if (wilc->io_type == WILC_HIF_SDIO && wilc->dev_irq_num)
                reg |= WILC_HAVE_SDIO_IRQ_GPIO;
 
        ret = wilc->hif_func->hif_write_reg(wilc, WILC_GP_REG_1, reg);
-       if (!ret) {
+       if (ret) {
                release_bus(wilc, WILC_BUS_RELEASE_ONLY);
-               return -EIO;
+               return ret;
        }
 
        wilc->hif_func->hif_sync_ext(wilc, NUM_INT_EXT);
 
        ret = wilc->hif_func->hif_read_reg(wilc, 0x1000, &chipid);
-       if (!ret) {
+       if (ret) {
                release_bus(wilc, WILC_BUS_RELEASE_ONLY);
-               return -EIO;
+               return ret;
        }
 
        wilc->hif_func->hif_read_reg(wilc, WILC_GLB_RESET_0, &reg);
@@ -902,7 +900,7 @@ int wilc_wlan_start(struct wilc *wilc)
        wilc->hif_func->hif_read_reg(wilc, WILC_GLB_RESET_0, &reg);
        release_bus(wilc, WILC_BUS_RELEASE_ONLY);
 
-       return (ret < 0) ? ret : 0;
+       return ret;
 }
 
 int wilc_wlan_stop(struct wilc *wilc, struct wilc_vif *vif)
@@ -913,33 +911,33 @@ int wilc_wlan_stop(struct wilc *wilc, struct wilc_vif *vif)
        acquire_bus(wilc, WILC_BUS_ACQUIRE_AND_WAKEUP);
 
        ret = wilc->hif_func->hif_read_reg(wilc, WILC_GP_REG_0, &reg);
-       if (!ret) {
+       if (ret) {
                netdev_err(vif->ndev, "Error while reading reg\n");
                release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
-               return -EIO;
+               return ret;
        }
 
        ret = wilc->hif_func->hif_write_reg(wilc, WILC_GP_REG_0,
                                        (reg | WILC_ABORT_REQ_BIT));
-       if (!ret) {
+       if (ret) {
                netdev_err(vif->ndev, "Error while writing reg\n");
                release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
-               return -EIO;
+               return ret;
        }
 
        ret = wilc->hif_func->hif_read_reg(wilc, WILC_FW_HOST_COMM, &reg);
-       if (!ret) {
+       if (ret) {
                netdev_err(vif->ndev, "Error while reading reg\n");
                release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
-               return -EIO;
+               return ret;
        }
        reg = BIT(0);
 
        ret = wilc->hif_func->hif_write_reg(wilc, WILC_FW_HOST_COMM, reg);
-       if (!ret) {
+       if (ret) {
                netdev_err(vif->ndev, "Error while writing reg\n");
                release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
-               return -EIO;
+               return ret;
        }
 
        release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
@@ -1112,10 +1110,11 @@ int wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids,
        return ret;
 }
 
-static u32 init_chip(struct net_device *dev)
+static int init_chip(struct net_device *dev)
 {
        u32 chipid;
-       u32 reg, ret = 0;
+       u32 reg;
+       int ret = 0;
        struct wilc_vif *vif = netdev_priv(dev);
        struct wilc *wilc = vif->wilc;
 
@@ -1125,18 +1124,18 @@ static u32 init_chip(struct net_device *dev)
 
        if ((chipid & 0xfff) != 0xa0) {
                ret = wilc->hif_func->hif_read_reg(wilc, 0x1118, &reg);
-               if (!ret) {
+               if (ret) {
                        netdev_err(dev, "fail read reg 0x1118\n");
                        goto release;
                }
                reg |= BIT(0);
                ret = wilc->hif_func->hif_write_reg(wilc, 0x1118, reg);
-               if (!ret) {
+               if (ret) {
                        netdev_err(dev, "fail write reg 0x1118\n");
                        goto release;
                }
                ret = wilc->hif_func->hif_write_reg(wilc, 0xc0000, 0x71);
-               if (!ret) {
+               if (ret) {
                        netdev_err(dev, "fail write reg 0xc0000\n");
                        goto release;
                }
@@ -1186,7 +1185,7 @@ int wilc_wlan_init(struct net_device *dev)
 
        wilc->quit = 0;
 
-       if (!wilc->hif_func->hif_init(wilc, false)) {
+       if (wilc->hif_func->hif_init(wilc, false)) {
                ret = -EIO;
                goto fail;
        }
@@ -1207,12 +1206,12 @@ int wilc_wlan_init(struct net_device *dev)
                goto fail;
        }
 
-       if (!init_chip(dev)) {
+       if (init_chip(dev)) {
                ret = -EIO;
                goto fail;
        }
 
-       return 1;
+       return 0;
 
 fail: