Commit a33c2f47 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: remove uneeded declarations 



This patch cleans up iwlwifi by removing uneeded declarations and removing
uneeded symbol export reducing the namespace pollution. It also fixes some
typos in comments.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 04816448

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

+1 −2
Original line number Diff line number Diff line
@@ -1607,8 +1607,7 @@ static int iwl4965_send_rxon_assoc(struct iwl_priv *priv) 
	return ret;

}





int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel)

static int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel)

{

	int rc;

	u8 band = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static u8 iwl4965_rate_get_lowest_plcp(struct iwl_priv *priv) 
		return IWL_RATE_6M_PLCP;

}



unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,

static unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,

				       struct iwl_frame *frame, u8 rate)

{

	struct iwl_tx_beacon_cmd *tx_beacon_cmd;

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

+3 −6
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ void iwl_set_rxon_chain(struct iwl_priv *priv) 
	else

		priv->staging_rxon.rx_chain &= ~RXON_RX_CHAIN_MIMO_FORCE_MSK;



	IWL_DEBUG_ASSOC("rx_chain=0x%Xi active=%d idle=%d\n",

	IWL_DEBUG_ASSOC("rx_chain=0x%X active=%d idle=%d\n",

			priv->staging_rxon.rx_chain,

			active_rx_cnt, idle_rx_cnt);
@@ -1158,7 +1158,6 @@ int iwl_verify_ucode(struct iwl_priv *priv) 
}

EXPORT_SYMBOL(iwl_verify_ucode);





static const char *desc_lookup(int i)

{

	switch (i) {
@@ -1239,9 +1238,9 @@ EXPORT_SYMBOL(iwl_dump_nic_error_log); 
/**

 * iwl_print_event_log - Dump error event log to syslog

 *

 * NOTE: Must be called with iwl4965_grab_nic_access() already obtained!

 * NOTE: Must be called with iwl_grab_nic_access() already obtained!

 */

void iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,

static void iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,

				u32 num_events, u32 mode)

{

	u32 i;
@@ -1282,8 +1281,6 @@ void iwl_print_event_log(struct iwl_priv *priv, u32 start_idx, 
		}

	}

}

EXPORT_SYMBOL(iwl_print_event_log);





void iwl_dump_nic_event_log(struct iwl_priv *priv)

{

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

+1 −9
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ struct iwl_cfg { 
struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg,

		struct ieee80211_ops *hw_ops);

void iwl_hw_detect(struct iwl_priv *priv);



void iwl_clear_stations_table(struct iwl_priv *priv);

void iwl_reset_qos(struct iwl_priv *priv);

void iwl_set_rxon_chain(struct iwl_priv *priv);
@@ -215,7 +214,6 @@ void iwl_rx_replenish(struct iwl_priv *priv); 
int iwl_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq);

int iwl_rx_agg_start(struct iwl_priv *priv, const u8 *addr, int tid, u16 ssn);

int iwl_rx_agg_stop(struct iwl_priv *priv, const u8 *addr, int tid);

/* FIXME: remove when TX is moved to iwl core */

int iwl_rx_queue_restock(struct iwl_priv *priv);

int iwl_rx_queue_space(const struct iwl_rx_queue *q);

void iwl_rx_allocate(struct iwl_priv *priv);
@@ -234,11 +232,7 @@ void iwl_rx_statistics(struct iwl_priv *priv, 
******************************************************/

int iwl_txq_ctx_reset(struct iwl_priv *priv);

int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb);

/* FIXME: remove when free Tx is fully merged into iwlcore */

int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq);

void iwl_hw_txq_ctx_free(struct iwl_priv *priv);

int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *tfd,

					dma_addr_t addr, u16 len);

int iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);

int iwl_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn);

int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid);
@@ -253,6 +247,7 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force); 
 * RF -Kill - here and not in iwl-rfkill.h to be available when

 * RF-kill subsystem is not compiled.

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

void iwl_rf_kill(struct iwl_priv *priv);

void iwl_radio_kill_sw_disable_radio(struct iwl_priv *priv);

int iwl_radio_kill_sw_enable_radio(struct iwl_priv *priv);
@@ -283,7 +278,6 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags) 
void iwl_init_scan_params(struct iwl_priv *priv);

int iwl_scan_cancel(struct iwl_priv *priv);

int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);

const char *iwl_escape_essid(const char *essid, u8 essid_len);

int iwl_scan_initiate(struct iwl_priv *priv);

void iwl_setup_rx_scan_handlers(struct iwl_priv *priv);

void iwl_setup_scan_deferred_work(struct iwl_priv *priv);
@@ -316,8 +310,6 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd); 
/*****************************************************

*  Error Handling Debugging

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

void iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,

			 u32 num_events, u32 mode);

void iwl_dump_nic_error_log(struct iwl_priv *priv);

void iwl_dump_nic_event_log(struct iwl_priv *priv);

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

+13 −32
Original line number Diff line number Diff line
@@ -565,50 +565,31 @@ struct iwl_hw_params { 
#define IWL_RX_STATS(x) (&x->u.rx_frame.stats)

#define IWL_RX_DATA(x) (IWL_RX_HDR(x)->payload)





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

 *

 * Functions implemented in iwl-base.c which are forward declared here

 * for use by iwl-*.c

 *

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

struct iwl_addsta_cmd;

extern int iwl_send_add_sta(struct iwl_priv *priv,

			    struct iwl_addsta_cmd *sta, u8 flags);

u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr, int is_ap,

			 u8 flags, struct ieee80211_ht_info *ht_info);

extern unsigned int iwl4965_fill_beacon_frame(struct iwl_priv *priv,

					struct ieee80211_hdr *hdr,

					const u8 *dest, int left);

extern void iwl4965_update_chain_flags(struct iwl_priv *priv);

int iwl4965_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src);

extern int iwl4965_set_power(struct iwl_priv *priv, void *cmd);



extern const u8 iwl_bcast_addr[ETH_ALEN];



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

 *

 * Functions implemented in iwl-[34]*.c which are forward declared here

 * for use by iwl-base.c

 * Functions implemented in core module which are forward declared here

 * for use by iwl-[4-5].c

 *

 * NOTE:  The implementation of these functions are hardware specific

 * which is why they are in the hardware specific files (vs. iwl-base.c)

 * NOTE:  The implementation of these functions are not hardware specific

 * which is why they are in the core module files.

 *

 * Naming convention --

 * iwl4965_         <-- Its part of iwlwifi (should be changed to iwl4965_)

 * iwl4965_hw_      <-- Hardware specific (implemented in iwl-XXXX.c by all HW)

 * iwl_         <-- Is part of iwlwifi

 * iwlXXXX_     <-- Hardware specific (implemented in iwl-XXXX.c for XXXX)

 * iwl4965_bg_      <-- Called from work queue context

 * iwl4965_mac_     <-- mac80211 callback

 *

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

struct iwl_addsta_cmd;

extern int iwl_send_add_sta(struct iwl_priv *priv,

			    struct iwl_addsta_cmd *sta, u8 flags);

extern u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr,

			int is_ap, u8 flags, struct ieee80211_ht_info *ht_info);

extern void iwl4965_update_chain_flags(struct iwl_priv *priv);

extern int iwl4965_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src);

extern const u8 iwl_bcast_addr[ETH_ALEN];

extern int iwl_rxq_stop(struct iwl_priv *priv);

extern void iwl_txq_ctx_stop(struct iwl_priv *priv);

extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,

				 struct iwl_frame *frame, u8 rate);

extern void iwl4965_disable_events(struct iwl_priv *priv);



extern int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel);

extern int iwl_queue_space(const struct iwl_queue *q);

static inline int iwl_queue_used(const struct iwl_queue *q, int i)

{