diff options
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wlan.c')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index bcbb92323a0a..d4ebbf67e50b 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -1,7 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#include <linux/completion.h> -#include "wilc_wlan_if.h" -#include "wilc_wlan.h" #include "wilc_wfi_netdevice.h" #include "wilc_wlan_cfg.h" @@ -819,12 +816,7 @@ static void wilc_wlan_handle_rx_buff(struct wilc *wilc, u8 *buffer, int size) if (wilc->cfg_seq_no == rsp.seq_no) complete(&wilc->cfg_event); } else if (rsp.type == WILC_CFG_RSP_STATUS) { - wilc_mac_indicate(wilc, - WILC_MAC_INDICATE_STATUS); - - } else if (rsp.type == WILC_CFG_RSP_SCAN) { - wilc_mac_indicate(wilc, - WILC_MAC_INDICATE_SCAN); + wilc_mac_indicate(wilc); } } } @@ -996,11 +988,11 @@ int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer, if (!ret) { ret = -EIO; - goto _fail_; + goto fail; } } while (offset < buffer_size); -_fail_: +fail: kfree(dma_buffer); @@ -1421,12 +1413,12 @@ int wilc_wlan_init(struct net_device *dev) if (!wilc->hif_func->hif_init(wilc, false)) { ret = -EIO; - goto _fail_; + goto fail; } if (!wilc_wlan_cfg_init()) { ret = -ENOBUFS; - goto _fail_; + goto fail; } if (!wilc->tx_buffer) @@ -1434,7 +1426,7 @@ int wilc_wlan_init(struct net_device *dev) if (!wilc->tx_buffer) { ret = -ENOBUFS; - goto _fail_; + goto fail; } if (!wilc->rx_buffer) @@ -1442,17 +1434,17 @@ int wilc_wlan_init(struct net_device *dev) if (!wilc->rx_buffer) { ret = -ENOBUFS; - goto _fail_; + goto fail; } if (!init_chip(dev)) { ret = -EIO; - goto _fail_; + goto fail; } return 1; -_fail_: +fail: kfree(wilc->rx_buffer); wilc->rx_buffer = NULL; |