Commit 416e1438 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

iwlwifi: mark more functions/variables static 



mark more functions/variables static

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 80f3e024

drivers/net/wireless/iwlwifi/iwl-3945.c

+1 −16
Original line number Diff line number Diff line
@@ -699,21 +699,6 @@ u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id, u16 tx_rate, u8 flags) 
	return sta_id;

}



void iwl_hw_card_show_info(struct iwl_priv *priv)

{

	IWL_DEBUG_INFO("3945ABG HW Version %u.%u.%u\n",

		       ((priv->eeprom.board_revision >> 8) & 0x0F),

		       ((priv->eeprom.board_revision >> 8) >> 4),

		       (priv->eeprom.board_revision & 0x00FF));



	IWL_DEBUG_INFO("3945ABG PBA Number %.*s\n",

		       (int)sizeof(priv->eeprom.board_pba_number),

		       priv->eeprom.board_pba_number);



	IWL_DEBUG_INFO("EEPROM_ANTENNA_SWITCH_TYPE is 0x%02X\n",

		       priv->eeprom.antenna_switch_type);

}



static int iwl3945_nic_set_pwr_src(struct iwl_priv *priv, int pwr_max)

{

	int rc;
@@ -1780,7 +1765,7 @@ void iwl3945_reg_txpower_periodic(struct iwl_priv *priv) 
			   &priv->thermal_periodic, REG_RECALIB_PERIOD * HZ);

}



void iwl3945_bg_reg_txpower_periodic(struct work_struct *work)

static void iwl3945_bg_reg_txpower_periodic(struct work_struct *work)

{

	struct iwl_priv *priv = container_of(work, struct iwl_priv,

					     thermal_periodic.work);

drivers/net/wireless/iwlwifi/iwl-3945.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ extern int iwl_eeprom_acquire_semaphore(struct iwl_priv *priv); 
extern __le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv);

extern int iwl3945_init_hw_rate_table(struct iwl_priv *priv);

extern void iwl3945_reg_txpower_periodic(struct iwl_priv *priv);

extern void iwl3945_bg_reg_txpower_periodic(struct work_struct *work);

extern int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv);

extern u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id,

		 u16 tx_rate, u8 flags);

drivers/net/wireless/iwlwifi/iwl-4965.c

+3 −1
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ 
#include "iwl-4965.h"

#include "iwl-helpers.h"



static void iwl_hw_card_show_info(struct iwl_priv *priv);



#define IWL_DECLARE_RATE_INFO(r, s, ip, in, rp, rn, pp, np)    \

	[IWL_RATE_##r##M_INDEX] = { IWL_RATE_##r##M_PLCP,      \

				    IWL_RATE_SISO_##s##M_PLCP, \
@@ -2744,7 +2746,7 @@ int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *ptr, 
	return 0;

}



void iwl_hw_card_show_info(struct iwl_priv *priv)

static void iwl_hw_card_show_info(struct iwl_priv *priv)

{

	u16 hw_version = priv->eeprom.board_revision_4965;

drivers/net/wireless/iwlwifi/iwl3945-base.c

+16 −13
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ 
u32 iwl_debug_level;

#endif



static int iwl_tx_queue_update_write_ptr(struct iwl_priv *priv,

				  struct iwl_tx_queue *txq);



/******************************************************************************

 *

 * module boiler plate
@@ -73,12 +76,12 @@ u32 iwl_debug_level; 
 ******************************************************************************/



/* module parameters */

int iwl_param_disable_hw_scan;

int iwl_param_debug;

int iwl_param_disable;      /* def: enable radio */

int iwl_param_antenna;      /* def: 0 = both antennas (use diversity) */

static int iwl_param_disable_hw_scan;

static int iwl_param_debug;

static int iwl_param_disable;      /* def: enable radio */

static int iwl_param_antenna;      /* def: 0 = both antennas (use diversity) */

int iwl_param_hwcrypto;     /* def: using software encryption */

int iwl_param_qos_enable = 1;

static int iwl_param_qos_enable = 1;

int iwl_param_queues_num = IWL_MAX_NUM_QUEUES;



/*
@@ -116,7 +119,7 @@ MODULE_VERSION(DRV_VERSION); 
MODULE_AUTHOR(DRV_COPYRIGHT);

MODULE_LICENSE("GPL");



__le16 *ieee80211_get_qos_ctrl(struct ieee80211_hdr *hdr)

static __le16 *ieee80211_get_qos_ctrl(struct ieee80211_hdr *hdr)

{

	u16 fc = le16_to_cpu(hdr->frame_control);

	int hdr_len = ieee80211_get_hdrlen(fc);
@@ -694,7 +697,7 @@ static int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 
	return ret ? ret : idx;

}



int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)

static int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)

{

	int ret;
@@ -718,7 +721,7 @@ int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 
	return 0;

}



int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)

static int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)

{

	int cmd_idx;

	int ret;
@@ -2200,7 +2203,7 @@ int iwl_is_network_packet(struct iwl_priv *priv, struct ieee80211_hdr *header) 


#define TX_STATUS_ENTRY(x) case TX_STATUS_FAIL_ ## x: return #x



const char *iwl_get_tx_fail_reason(u32 status)

static const char *iwl_get_tx_fail_reason(u32 status)

{

	switch (status & TX_STATUS_MSK) {

	case TX_STATUS_SUCCESS:
@@ -3354,7 +3357,7 @@ static void iwl_txstatus_to_ieee(struct iwl_priv *priv, 
 * new 'R' index need to be reclaimed. As result, some free space

 * forms. If there is enough free space (> low mark), wake Tx queue.

 */

int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)

static int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)

{

	struct iwl_tx_queue *txq = &priv->txq[txq_id];

	struct iwl_queue *q = &txq->q;
@@ -3994,7 +3997,7 @@ static inline __le32 iwl_dma_addr2rbd_ptr(struct iwl_priv *priv, 
 * also updates the memory address in the firmware to reference the new

 * target buffer.

 */

int iwl_rx_queue_restock(struct iwl_priv *priv)

static int iwl_rx_queue_restock(struct iwl_priv *priv)

{

	struct iwl_rx_queue *rxq = &priv->rxq;

	struct list_head *element;
@@ -4084,7 +4087,7 @@ void iwl_rx_replenish(void *data) 
 * This free routine walks the list of POOL entries and if SKB is set to

 * non NULL it is unmapped and freed

 */

void iwl_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)

static void iwl_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)

{

	int i;

	for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
@@ -4327,7 +4330,7 @@ static void iwl_rx_handle(struct iwl_priv *priv) 
	iwl_rx_queue_restock(priv);

}



int iwl_tx_queue_update_write_ptr(struct iwl_priv *priv,

static int iwl_tx_queue_update_write_ptr(struct iwl_priv *priv,

				  struct iwl_tx_queue *txq)

{

	u32 reg = 0;

drivers/net/wireless/iwlwifi/iwl4965-base.c

+14 −11
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ 
u32 iwl_debug_level;

#endif



static int iwl_tx_queue_update_write_ptr(struct iwl_priv *priv,

				  struct iwl_tx_queue *txq);



/******************************************************************************

 *

 * module boiler plate
@@ -73,12 +76,12 @@ u32 iwl_debug_level; 
 ******************************************************************************/



/* module parameters */

int iwl_param_disable_hw_scan;

int iwl_param_debug;

int iwl_param_disable;      /* def: enable radio */

int iwl_param_antenna;      /* def: 0 = both antennas (use diversity) */

static int iwl_param_disable_hw_scan;

static int iwl_param_debug;

static int iwl_param_disable;      /* def: enable radio */

static int iwl_param_antenna;      /* def: 0 = both antennas (use diversity) */

int iwl_param_hwcrypto;     /* def: using software encryption */

int iwl_param_qos_enable = 1;

static int iwl_param_qos_enable = 1;

int iwl_param_queues_num = IWL_MAX_NUM_QUEUES;



/*
@@ -692,7 +695,7 @@ static int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 
	return ret ? ret : idx;

}



int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)

static int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)

{

	int ret;
@@ -716,7 +719,7 @@ int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 
	return 0;

}



int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)

static int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)

{

	int cmd_idx;

	int ret;
@@ -2281,7 +2284,7 @@ int iwl_is_network_packet(struct iwl_priv *priv, struct ieee80211_hdr *header) 


#define TX_STATUS_ENTRY(x) case TX_STATUS_FAIL_ ## x: return #x



const char *iwl_get_tx_fail_reason(u32 status)

static const char *iwl_get_tx_fail_reason(u32 status)

{

	switch (status & TX_STATUS_MSK) {

	case TX_STATUS_SUCCESS:
@@ -4321,7 +4324,7 @@ static inline __le32 iwl_dma_addr2rbd_ptr(struct iwl_priv *priv, 
 * also updates the memory address in the firmware to reference the new

 * target buffer.

 */

int iwl_rx_queue_restock(struct iwl_priv *priv)

static int iwl_rx_queue_restock(struct iwl_priv *priv)

{

	struct iwl_rx_queue *rxq = &priv->rxq;

	struct list_head *element;
@@ -4411,7 +4414,7 @@ void iwl_rx_replenish(void *data) 
 * This free routine walks the list of POOL entries and if SKB is set to

 * non NULL it is unmapped and freed

 */

void iwl_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)

static void iwl_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)

{

	int i;

	for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
@@ -4657,7 +4660,7 @@ static void iwl_rx_handle(struct iwl_priv *priv) 
	iwl_rx_queue_restock(priv);

}



int iwl_tx_queue_update_write_ptr(struct iwl_priv *priv,

static int iwl_tx_queue_update_write_ptr(struct iwl_priv *priv,

				  struct iwl_tx_queue *txq)

{

	u32 reg = 0;