diff options
| author | Glen Lee <glen.lee@atmel.com> | 2015-10-01 10:03:33 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-02 12:59:52 +0300 |
| commit | e42563bbb223190575918c1706309ff99deef331 (patch) | |
| tree | d000be63ad3ede3b2d0d06cef9bc52510a919391 | |
| parent | 63d7ab8efd4da800848a2862624bd5ebb482354f (diff) | |
| download | linux-e42563bbb223190575918c1706309ff99deef331.tar.xz | |
staging: wilc1000: remove function pointer wlan_start
This patch removes function pointer wlan_start and just call
the function wilc_wlan_start. Remove static from the function also.
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 2 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.c | 3 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.h | 1 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan_if.h | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index d7909d38b79a..f515fcab5615 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -622,7 +622,7 @@ static int linux_wlan_start_firmware(perInterface_wlan_t *nic) int ret = 0; /* start firmware */ PRINT_D(INIT_DBG, "Starting Firmware ...\n"); - ret = g_linux_wlan->oup.wlan_start(); + ret = wilc_wlan_start(); if (ret < 0) { PRINT_ER("Failed to start Firmware\n"); goto _fail_; diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 5e9a4c2bd4bb..6e2bf4cd5c5e 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -1471,7 +1471,7 @@ _fail_1: * Common * ********************************************/ -static int wilc_wlan_start(void) +int wilc_wlan_start(void) { wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan; u32 reg = 0; @@ -2027,7 +2027,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup) /** * export functions **/ - oup->wlan_start = wilc_wlan_start; oup->wlan_stop = wilc_wlan_stop; oup->wlan_add_to_tx_que = wilc_wlan_txq_add_net_pkt; oup->wlan_handle_tx_que = wilc_wlan_handle_txq; diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h index 72d2ebf2df97..15ae9aeeacf4 100644 --- a/drivers/staging/wilc1000/wilc_wlan.h +++ b/drivers/staging/wilc1000/wilc_wlan.h @@ -306,4 +306,5 @@ typedef struct { } wilc_cfg_func_t; int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size); +int wilc_wlan_start(void); #endif diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h index e481446626fd..e752092f4d40 100644 --- a/drivers/staging/wilc1000/wilc_wlan_if.h +++ b/drivers/staging/wilc1000/wilc_wlan_if.h @@ -122,7 +122,6 @@ typedef void (*wilc_tx_complete_func_t)(void *, int); #define WILC_TX_ERR_NO_BUF (-2) typedef struct { - int (*wlan_start)(void); int (*wlan_stop)(void); int (*wlan_add_to_tx_que)(void *, u8 *, u32, wilc_tx_complete_func_t); int (*wlan_handle_tx_que)(u32 *); |