Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1608c403 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging/wilc1000: make symbols static if possible 



All symbols that are only referenced in the file that defines
them can be declared 'static' to avoid namespace pollution,
to produce better object code, and to make the source more
readable.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f550d93

drivers/staging/wilc1000/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ ccflags-y += -DSTA_FIRMWARE=\"atmel/wilc1000_fw.bin\" \ 
		-DAP_FIRMWARE=\"atmel/wilc1000_ap_fw.bin\" \

		-DP2P_CONCURRENCY_FIRMWARE=\"atmel/wilc1000_p2p_fw.bin\"



ccflags-y += -I$(src)/ -D__CHECK_ENDIAN__ -DWILC_ASIC_A0 \

		-Wno-unused-function -DWILC_DEBUGFS

ccflags-y += -I$(src)/ -D__CHECK_ENDIAN__ -DWILC_ASIC_A0 -DWILC_DEBUGFS

#ccflags-y += -DTCP_ACK_FILTER



ccflags-$(CONFIG_WILC1000_PREALLOCATE_AT_LOADING_DRIVER) += -DMEMORY_STATIC \

drivers/staging/wilc1000/coreconfigurator.c

+2 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static inline u16 get_asoc_id(u8 *data) 
	return asoc_id;

}



u8 *get_tim_elm(u8 *pu8msa, u16 u16RxLen, u16 u16TagParamOffset)

static u8 *get_tim_elm(u8 *pu8msa, u16 u16RxLen, u16 u16TagParamOffset)

{

	u16 u16index;
@@ -315,7 +315,7 @@ u8 *get_tim_elm(u8 *pu8msa, u16 u16RxLen, u16 u16TagParamOffset) 


/* This function gets the current channel information from

 * the 802.11n beacon/probe response frame */

u8 get_current_channel_802_11n(u8 *pu8msa, u16 u16RxLen)

static u8 get_current_channel_802_11n(u8 *pu8msa, u16 u16RxLen)

{

	u16 index;

drivers/staging/wilc1000/host_interface.c

+22 −13
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ struct join_bss_param { 
static struct host_if_drv *wfidrv_list[NUM_CONCURRENT_IFC + 1];

struct host_if_drv *terminated_handle;

bool g_obtainingIP;

u8 P2P_LISTEN_STATE;

static u8 P2P_LISTEN_STATE;

static struct task_struct *hif_thread_handler;

static WILC_MsgQueueHandle hif_msg_q;

static struct semaphore hif_sema_thread;
@@ -259,10 +259,10 @@ static u8 del_beacon; 
static u32 clients_count;



static u8 *join_req;

u8 *info_element;

static u8 *info_element;

static u8 mode_11i;

u8 auth_type;

u32 join_req_size;

static u8 auth_type;

static u32 join_req_size;

static u32 info_element_size;

static struct host_if_drv *join_req_drv;

#define REAL_JOIN_REQ 0
@@ -396,7 +396,9 @@ static s32 handle_set_operation_mode(struct host_if_drv *hif_drv, 
	return result;

}



s32 handle_set_ip_address(struct host_if_drv *hif_drv, u8 *ip_addr, u8 idx)

static s32 host_int_get_ipaddress(struct host_if_drv *hif_drv, u8 *u16ipadd, u8 idx);



static s32 handle_set_ip_address(struct host_if_drv *hif_drv, u8 *ip_addr, u8 idx)

{

	s32 result = 0;

	struct wid wid;
@@ -430,7 +432,7 @@ s32 handle_set_ip_address(struct host_if_drv *hif_drv, u8 *ip_addr, u8 idx) 
	return result;

}



s32 handle_get_ip_address(struct host_if_drv *hif_drv, u8 idx)

static s32 handle_get_ip_address(struct host_if_drv *hif_drv, u8 idx)

{

	s32 result = 0;

	struct wid wid;
@@ -817,6 +819,9 @@ static void Handle_wait_msg_q_empty(void) 
	up(&hif_sema_wait_response);

}



static s32 Handle_ScanDone(struct host_if_drv *hif_drv,

			   enum scan_event enuEvent);



static s32 Handle_Scan(struct host_if_drv *hif_drv,

		       struct scan_attr *pstrHostIFscanAttr)

{
@@ -1483,6 +1488,11 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv, 
	return result;

}



static s32 host_int_get_assoc_res_info(struct host_if_drv *hif_drv,

				       u8 *pu8AssocRespInfo,

				       u32 u32MaxAssocRespInfoLen,

				       u32 *pu32RcvdAssocRespInfoLen);



static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,

				    struct rcvd_async_info *pstrRcvdGnrlAsyncInfo)

{
@@ -2140,7 +2150,7 @@ static void Handle_GetLinkspeed(struct host_if_drv *hif_drv) 
	up(&hif_drv->sem_get_link_speed);

}



s32 Handle_GetStatistics(struct host_if_drv *hif_drv, struct rf_info *pstrStatistics)

static s32 Handle_GetStatistics(struct host_if_drv *hif_drv, struct rf_info *pstrStatistics)

{

	struct wid strWIDList[5];

	u32 u32WidsCount = 0, result = 0;
@@ -3534,8 +3544,7 @@ s32 host_int_disconnect(struct host_if_drv *hif_drv, u16 u16ReasonCode) 
	return result;

}





s32 host_int_get_assoc_res_info(struct host_if_drv *hif_drv,

static s32 host_int_get_assoc_res_info(struct host_if_drv *hif_drv,

				       u8 *pu8AssocRespInfo,

				       u32 u32MaxAssocRespInfoLen,

				       u32 *pu32RcvdAssocRespInfoLen)
@@ -4706,7 +4715,7 @@ s32 host_int_setup_ipaddress(struct host_if_drv *hif_drv, u8 *u16ipadd, u8 idx) 
	return result;

}



s32 host_int_get_ipaddress(struct host_if_drv *hif_drv, u8 *u16ipadd, u8 idx)

static s32 host_int_get_ipaddress(struct host_if_drv *hif_drv, u8 *u16ipadd, u8 idx)

{

	s32 result = 0;

	struct host_if_msg msg;

drivers/staging/wilc1000/host_interface.h

+0 −8
Original line number Diff line number Diff line
@@ -338,10 +338,6 @@ s32 host_int_set_join_req(struct host_if_drv *hWFIDrv, u8 *pu8bssid, 
			  u8 u8channel, void *pJoinParams);

s32 host_int_flush_join_req(struct host_if_drv *hWFIDrv);

s32 host_int_disconnect(struct host_if_drv *hWFIDrv, u16 u16ReasonCode);

s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv,

				u8 *pu8AssocRespInfo,

				u32 u32MaxAssocRespInfoLen,

				u32 *pu32RcvdAssocRespInfoLen);

int host_int_set_mac_chnl_num(struct host_if_drv *wfi_drv, u8 channel);

s32 host_int_get_rssi(struct host_if_drv *hWFIDrv, s8 *ps8Rssi);

s32 host_int_scan(struct host_if_drv *hWFIDrv, u8 u8ScanSource,
@@ -379,7 +375,6 @@ s32 host_int_setup_ipaddress(struct host_if_drv *hWFIDrv, 
s32 host_int_del_All_Rx_BASession(struct host_if_drv *hWFIDrv,

				  char *pBSSID,

				  char TID);

s32 host_int_get_ipaddress(struct host_if_drv *hWFIDrv, u8 *pu8IPAddr, u8 idx);

s32 host_int_remain_on_channel(struct host_if_drv *hWFIDrv,

			       u32 u32SessionID,

			       u32 u32duration,
@@ -394,9 +389,6 @@ s32 host_int_frame_register(struct host_if_drv *hWFIDrv, 
int host_int_set_wfi_drv_handler(struct host_if_drv *address);

int host_int_set_operation_mode(struct host_if_drv *wfi_drv, u32 mode);



static s32 Handle_ScanDone(struct host_if_drv *drvHandler,

			   enum scan_event enuEvent);



void host_int_freeJoinParams(void *pJoinParams);



s32 host_int_get_statistics(struct host_if_drv *hWFIDrv,

drivers/staging/wilc1000/linux_mon.c

+3 −3
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ static struct net_device *wilc_wfi_mon; /* global monitor netdev */ 
extern int  mac_xmit(struct sk_buff *skb, struct net_device *dev);





u8 srcAdd[6];

u8 bssid[6];

u8 broadcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

static u8 srcAdd[6];

static u8 bssid[6];

static u8 broadcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

/**

 *  @brief      WILC_WFI_monitor_rx

 *  @details