staging: wilc1000: Remove unnecessary extern variables.
PATCH v2 1/1 staging: wilc1000: Remove unnecessary extern variables.
Extern variables and functions used in only one file were removed from .h files, and made static in the .c files they're used.
Extern variable wilc_initialized was declared and never used, so it was removed.
Signed-off-by Elise Lennion <[email protected]>
---
v2: Make functions of v1 static in the only .c file that uses them. Add other variables and functions cleanups.
drivers/staging/wilc1000/host_interface.h | 1 - drivers/staging/wilc1000/linux_wlan.c | 6 ++++-- drivers/staging/wilc1000/wilc_sdio.c | 3 ++- drivers/staging/wilc1000/wilc_spi.c | 3 ++- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 5 ----- drivers/staging/wilc1000/wilc_wlan.h | 6 ------ 6 files changed, 8 insertions(+), 16 deletions(-)
drivers/staging/wilc1000/host_interface.h +0 -1
@@ -367,7 +367,6 @@ extern u8 wilc_connected_ssid[6];extern u8 wilc_multicast_mac_addr_list[WILC_MULTICAST_TABLE_SIZE ][ETH_ALEN ];extern int wilc_connecting; -extern u8 wilc_initialized;extern struct timer_list wilc_during_ip_timer;#endif
drivers/staging/wilc1000/linux_wlan.c +4 -2
@@ -37,6 +37,8 @@ static void linux_wlan_tx_complete(void *priv, int status);static int mac_init_fn (struct net_device *ndev);static struct net_device_stats *mac_stats (struct net_device *dev);static int mac_ioctl (struct net_device *ndev,struct ifreq *req,int cmd); +static int wilc_mac_open (struct net_device *ndev); +static int wilc_mac_close (struct net_device *ndev);static void wilc_set_multicast_list (struct net_device *dev);bool wilc_enable_ps = true;
@@ -847,7 +849,7 @@ static int mac_init_fn(struct net_device *ndev)return 0 ; } -int wilc_mac_open (struct net_device *ndev) +static int wilc_mac_open (struct net_device *ndev) {struct wilc_vif *vif;
@@ -1038,7 +1040,7 @@ int wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev)return 0 ; } -int wilc_mac_close (struct net_device *ndev) +static int wilc_mac_close (struct net_device *ndev) {struct wilc_priv *priv;struct wilc_vif *vif;
drivers/staging/wilc1000/wilc_sdio.c +2 -1
@@ -39,6 +39,7 @@ struct wilc_sdio { };static struct wilc_sdio g_sdio; +static const struct wilc_hif_func wilc_hif_sdio;static int sdio_write_reg (struct wilc *wilc,u32 addr,u32 data);static int sdio_read_reg (struct wilc *wilc,u32 addr,u32 *data);
@@ -1100,7 +1101,7 @@ static int sdio_sync_ext(struct wilc *wilc, int nint)* ********************************************/ -const struct wilc_hif_func wilc_hif_sdio = { +static const struct wilc_hif_func wilc_hif_sdio = { .hif_init = sdio_init, .hif_deinit = sdio_deinit, .hif_read_reg = sdio_read_reg,
drivers/staging/wilc1000/wilc_spi.c +2 -1
@@ -30,6 +30,7 @@ struct wilc_spi { };static struct wilc_spi g_spi; +static const struct wilc_hif_func wilc_hif_spi;static int wilc_spi_read (struct wilc *wilc,u32 ,u8 *,u32 );static int wilc_spi_write (struct wilc *wilc,u32 ,u8 *,u32 );
@@ -1134,7 +1135,7 @@ static int wilc_spi_sync_ext(struct wilc *wilc, int nint)* Global spi HIF function table * ********************************************/ -const struct wilc_hif_func wilc_hif_spi = { +static const struct wilc_hif_func wilc_hif_spi = { .hif_init = wilc_spi_init, .hif_deinit = _wilc_spi_deinit, .hif_read_reg = wilc_spi_read_reg,
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +0 -5
@@ -90,17 +90,12 @@ static const struct wiphy_wowlan_support wowlan_support = {#define IS_MGMT_STATUS_SUCCES 0x040#define GET_PKT_OFFSET (a) (((a) >> 22) & 0x1ff) -extern int wilc_mac_open (struct net_device *ndev); -extern int wilc_mac_close (struct net_device *ndev); -static struct network_info last_scanned_shadow[MAX_NUM_SCANNED_NETWORKS_SHADOW ];static u32 last_scanned_cnt;struct timer_list wilc_during_ip_timer;static struct timer_list hAgingTimer;static u8 op_ifcs; -u8 wilc_initialized =1 ; -#define CHAN2G (_channel, _freq, _flags) { \ .band = NL80211_BAND_2GHZ, \ .center_freq = (_freq), \
drivers/staging/wilc1000/wilc_wlan.h +0 -6
@@ -248,9 +248,6 @@ struct wilc_hif_func {void (*disable_interrupt)(struct wilc *nic); }; -extern const struct wilc_hif_func wilc_hif_spi; -extern const struct wilc_hif_func wilc_hif_sdio; -/******************************************** * * Configuration Structure
@@ -297,9 +294,6 @@ void wilc_enable_tcp_ack_filter(bool value);int wilc_wlan_get_num_conn_ifcs (struct wilc *);int wilc_mac_xmit (struct sk_buff *skb,struct net_device *dev); -int wilc_mac_open (struct net_device *ndev); -int wilc_mac_close (struct net_device *ndev); -void WILC_WFI_p2p_rx (struct net_device *dev,u8 *buff,u32 size);void host_wakeup_notify (struct wilc *wilc);void host_sleep_notify (struct wilc *wilc);
Signature · 1 line
2.7.4