Commit 74a3a250 authored by Reinette Chatre's avatar Reinette Chatre Committed by David S. Miller
Browse files

iwlwifi: cleanup usage of inline functions 



Be consistent when using inline functions. If the function only used
once we move it to where it is used - no need for externs.

Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 849e0dce

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

+0 −14
Original line number Diff line number Diff line
@@ -2369,18 +2369,4 @@ struct pci_device_id iwl3945_hw_card_ids[] = { 
	{0}

};



/*

 * Clear the OWNER_MSK, to establish driver (instead of uCode running on

 * embedded controller) as EEPROM reader; each read is a series of pulses

 * to/from the EEPROM chip, not a single event, so even reads could conflict

 * if they weren't arbitrated by some ownership mechanism.  Here, the driver

 * simply claims ownership, which should be safe when this function is called

 * (i.e. before loading uCode!).

 */

inline int iwl3945_eeprom_acquire_semaphore(struct iwl3945_priv *priv)

{

	_iwl3945_clear_bit(priv, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK);

	return 0;

}



MODULE_DEVICE_TABLE(pci, iwl3945_hw_card_ids);

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

+0 −1
Original line number Diff line number Diff line
@@ -671,7 +671,6 @@ extern int iwl3945_hw_channel_switch(struct iwl3945_priv *priv, u16 channel); 
/*

 * Forward declare iwl-3945.c functions for iwl-base.c

 */

extern int iwl3945_eeprom_acquire_semaphore(struct iwl3945_priv *priv);

extern __le32 iwl3945_get_antenna_flags(const struct iwl3945_priv *priv);

extern int iwl3945_init_hw_rate_table(struct iwl3945_priv *priv);

extern void iwl3945_reg_txpower_periodic(struct iwl3945_priv *priv);

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

+0 −7
Original line number Diff line number Diff line
@@ -4961,11 +4961,4 @@ int iwl4965_eeprom_acquire_semaphore(struct iwl4965_priv *priv) 
	return rc;

}



inline void iwl4965_eeprom_release_semaphore(struct iwl4965_priv *priv)

{

	iwl4965_clear_bit(priv, CSR_HW_IF_CONFIG_REG,

		CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);

}





MODULE_DEVICE_TABLE(pci, iwl4965_hw_card_ids);

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

+0 −1
Original line number Diff line number Diff line
@@ -750,7 +750,6 @@ struct iwl4965_priv; 
 * Forward declare iwl-4965.c functions for iwl-base.c

 */

extern int iwl4965_eeprom_acquire_semaphore(struct iwl4965_priv *priv);

extern void iwl4965_eeprom_release_semaphore(struct iwl4965_priv *priv);



extern int iwl4965_tx_queue_update_wr_ptr(struct iwl4965_priv *priv,

					  struct iwl4965_tx_queue *txq,

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

+14 −0
Original line number Diff line number Diff line
@@ -1557,6 +1557,20 @@ static void get_eeprom_mac(struct iwl3945_priv *priv, u8 *mac) 
	memcpy(mac, priv->eeprom.mac_address, 6);

}



/*

 * Clear the OWNER_MSK, to establish driver (instead of uCode running on

 * embedded controller) as EEPROM reader; each read is a series of pulses

 * to/from the EEPROM chip, not a single event, so even reads could conflict

 * if they weren't arbitrated by some ownership mechanism.  Here, the driver

 * simply claims ownership, which should be safe when this function is called

 * (i.e. before loading uCode!).

 */

static inline int iwl3945_eeprom_acquire_semaphore(struct iwl3945_priv *priv)

{

	_iwl3945_clear_bit(priv, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK);

	return 0;

}



/**

 * iwl3945_eeprom_init - read EEPROM contents

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE