UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlagn: Rename iwlcore prefix 

There are number of functions with "iwlcore_" prefix which not feels right,
rename those to "iwl_".

No functional changes by making the renames.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Wey-Yi Guy 2011-08-25 23:10:33 -07:00 committed by John W. Linville
parent 107021c4ce
commit b39488a9bd
10 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/iwlwifi/iwl-2000.c
View File

@ -179,7 +179,7 @@ static struct iwl_lib_ops iwl2000_lib = {
EEPROM_6000_REG_BAND_24_HT40_CHANNELS, EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
EEPROM_REGULATORY_BAND_NO_HT40, EEPROM_REGULATORY_BAND_NO_HT40,
}, },
.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower, .update_enhanced_txpower = iwl_eeprom_enhanced_txpower,
}, },
.temperature = iwlagn_temperature, .temperature = iwlagn_temperature,
}; };
@ -200,7 +200,7 @@ static struct iwl_lib_ops iwl2030_lib = {
EEPROM_6000_REG_BAND_24_HT40_CHANNELS, EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
EEPROM_REGULATORY_BAND_NO_HT40, EEPROM_REGULATORY_BAND_NO_HT40,
}, },
.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower, .update_enhanced_txpower = iwl_eeprom_enhanced_txpower,
}, },
.temperature = iwlagn_temperature, .temperature = iwlagn_temperature,
}; };

4
drivers/net/wireless/iwlwifi/iwl-6000.c
View File

@ -272,7 +272,7 @@ static struct iwl_lib_ops iwl6000_lib = {
EEPROM_6000_REG_BAND_24_HT40_CHANNELS, EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
EEPROM_REG_BAND_52_HT40_CHANNELS EEPROM_REG_BAND_52_HT40_CHANNELS
}, },
.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower, .update_enhanced_txpower = iwl_eeprom_enhanced_txpower,
}, },
.temperature = iwlagn_temperature, .temperature = iwlagn_temperature,
}; };
@ -294,7 +294,7 @@ static struct iwl_lib_ops iwl6030_lib = {
EEPROM_6000_REG_BAND_24_HT40_CHANNELS, EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
EEPROM_REG_BAND_52_HT40_CHANNELS EEPROM_REG_BAND_52_HT40_CHANNELS
}, },
.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower, .update_enhanced_txpower = iwl_eeprom_enhanced_txpower,
}, },
.temperature = iwlagn_temperature, .temperature = iwlagn_temperature,
}; };

6
drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
View File

@ -195,7 +195,7 @@ static s8 iwl_get_max_txpower_avg(struct iwl_priv *priv,
} }
static void static void
iwlcore_eeprom_enh_txp_read_element(struct iwl_priv *priv, iwl_eeprom_enh_txp_read_element(struct iwl_priv *priv,
struct iwl_eeprom_enhanced_txpwr *txp, struct iwl_eeprom_enhanced_txpwr *txp,
s8 max_txpower_avg) s8 max_txpower_avg)
{ {
@ -235,7 +235,7 @@ iwlcore_eeprom_enh_txp_read_element(struct iwl_priv *priv,
#define TXP_CHECK_AND_PRINT(x) ((txp->flags & IWL_EEPROM_ENH_TXP_FL_##x) \ #define TXP_CHECK_AND_PRINT(x) ((txp->flags & IWL_EEPROM_ENH_TXP_FL_##x) \
? # x " " : "") ? # x " " : "")
void iwlcore_eeprom_enhanced_txpower(struct iwl_priv *priv) void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
{ {
struct iwl_eeprom_enhanced_txpwr *txp_array, *txp; struct iwl_eeprom_enhanced_txpwr *txp_array, *txp;
int idx, entries; int idx, entries;
@ -294,6 +294,6 @@ void iwlcore_eeprom_enhanced_txpower(struct iwl_priv *priv)
if (max_txp_avg_halfdbm > priv->tx_power_lmt_in_half_dbm) if (max_txp_avg_halfdbm > priv->tx_power_lmt_in_half_dbm)
priv->tx_power_lmt_in_half_dbm = max_txp_avg_halfdbm; priv->tx_power_lmt_in_half_dbm = max_txp_avg_halfdbm;
iwlcore_eeprom_enh_txp_read_element(priv, txp, max_txp_avg); iwl_eeprom_enh_txp_read_element(priv, txp, max_txp_avg);
} }
} }

4
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
View File

@ -369,7 +369,7 @@ static int iwlagn_alive_notify(struct iwl_priv *priv)
* using sample data 100 bytes apart. If these sample points are good, * using sample data 100 bytes apart. If these sample points are good,
* it's a pretty good bet that everything between them is good, too. * it's a pretty good bet that everything between them is good, too.
*/ */
static int iwlcore_verify_inst_sparse(struct iwl_priv *priv, static int iwl_verify_inst_sparse(struct iwl_priv *priv,
struct fw_desc *fw_desc) struct fw_desc *fw_desc)
{ {
__le32 *image = (__le32 *)fw_desc->v_addr; __le32 *image = (__le32 *)fw_desc->v_addr;
@ -427,7 +427,7 @@ static void iwl_print_mismatch_inst(struct iwl_priv *priv,
*/ */
static int iwl_verify_ucode(struct iwl_priv *priv, struct fw_img *img) static int iwl_verify_ucode(struct iwl_priv *priv, struct fw_img *img)
{ {
if (!iwlcore_verify_inst_sparse(priv, &img->code)) { if (!iwl_verify_inst_sparse(priv, &img->code)) {
IWL_DEBUG_FW(priv, "uCode is good in inst SRAM\n"); IWL_DEBUG_FW(priv, "uCode is good in inst SRAM\n");
return 0; return 0;
} }

4
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@ -3459,7 +3459,7 @@ static int iwl_init_drv(struct iwl_priv *priv)
goto err; goto err;
} }
ret = iwlcore_init_geos(priv); ret = iwl_init_geos(priv);
if (ret) { if (ret) {
IWL_ERR(priv, "initializing geos failed: %d\n", ret); IWL_ERR(priv, "initializing geos failed: %d\n", ret);
goto err_free_channel_map; goto err_free_channel_map;
@ -3477,7 +3477,7 @@ err:
static void iwl_uninit_drv(struct iwl_priv *priv) static void iwl_uninit_drv(struct iwl_priv *priv)
{ {
iwl_calib_free_results(priv); iwl_calib_free_results(priv);
iwlcore_free_geos(priv); iwl_free_geos(priv);
iwl_free_channel_map(priv); iwl_free_channel_map(priv);
kfree(priv->scan_cmd); kfree(priv->scan_cmd);
kfree(priv->beacon_cmd); kfree(priv->beacon_cmd);

2
drivers/net/wireless/iwlwifi/iwl-agn.h
View File

@ -287,7 +287,7 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags)
} }
/* eeprom */ /* eeprom */
void iwlcore_eeprom_enhanced_txpower(struct iwl_priv *priv); void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv);
void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac); void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac);
/* notification wait support */ /* notification wait support */

14
drivers/net/wireless/iwlwifi/iwl-core.c
View File

@ -51,7 +51,7 @@ const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
#define MAX_BIT_RATE_40_MHZ 150 /* Mbps */ #define MAX_BIT_RATE_40_MHZ 150 /* Mbps */
#define MAX_BIT_RATE_20_MHZ 72 /* Mbps */ #define MAX_BIT_RATE_20_MHZ 72 /* Mbps */
static void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv, static void iwl_init_ht_hw_capab(const struct iwl_priv *priv,
struct ieee80211_sta_ht_cap *ht_info, struct ieee80211_sta_ht_cap *ht_info,
enum ieee80211_band band) enum ieee80211_band band)
{ {
@ -107,9 +107,9 @@ static void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv,
} }
/** /**
* iwlcore_init_geos - Initialize mac80211's geo/channel info based from eeprom * iwl_init_geos - Initialize mac80211's geo/channel info based from eeprom
*/ */
int iwlcore_init_geos(struct iwl_priv *priv) int iwl_init_geos(struct iwl_priv *priv)
{ {
struct iwl_channel_info *ch; struct iwl_channel_info *ch;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
@ -146,7 +146,7 @@ int iwlcore_init_geos(struct iwl_priv *priv)
sband->n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE; sband->n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE;
if (priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE) if (priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE)
iwlcore_init_ht_hw_capab(priv, &sband->ht_cap, iwl_init_ht_hw_capab(priv, &sband->ht_cap,
IEEE80211_BAND_5GHZ); IEEE80211_BAND_5GHZ);
sband = &priv->bands[IEEE80211_BAND_2GHZ]; sband = &priv->bands[IEEE80211_BAND_2GHZ];
@ -156,7 +156,7 @@ int iwlcore_init_geos(struct iwl_priv *priv)
sband->n_bitrates = IWL_RATE_COUNT_LEGACY; sband->n_bitrates = IWL_RATE_COUNT_LEGACY;
if (priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE) if (priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE)
iwlcore_init_ht_hw_capab(priv, &sband->ht_cap, iwl_init_ht_hw_capab(priv, &sband->ht_cap,
IEEE80211_BAND_2GHZ); IEEE80211_BAND_2GHZ);
priv->ieee_channels = channels; priv->ieee_channels = channels;
@ -228,9 +228,9 @@ int iwlcore_init_geos(struct iwl_priv *priv)
} }
/* /*
* iwlcore_free_geos - undo allocations in iwlcore_init_geos * iwl_free_geos - undo allocations in iwl_init_geos
*/ */
void iwlcore_free_geos(struct iwl_priv *priv) void iwl_free_geos(struct iwl_priv *priv)
{ {
kfree(priv->ieee_channels); kfree(priv->ieee_channels);
kfree(priv->ieee_rates); kfree(priv->ieee_rates);

4
drivers/net/wireless/iwlwifi/iwl-core.h
View File

@ -429,8 +429,8 @@ void iwl_clear_isr_stats(struct iwl_priv *priv);
/***************************************************** /*****************************************************
* GEOS * GEOS
******************************************************/ ******************************************************/
int iwlcore_init_geos(struct iwl_priv *priv); int iwl_init_geos(struct iwl_priv *priv);
void iwlcore_free_geos(struct iwl_priv *priv); void iwl_free_geos(struct iwl_priv *priv);
/*************** DRIVER STATUS FUNCTIONS *****/ /*************** DRIVER STATUS FUNCTIONS *****/

4
drivers/net/wireless/iwlwifi/iwl-eeprom.c
View File

@ -226,7 +226,7 @@ static void iwl_set_otp_access(struct iwl_priv *priv, enum iwl_access_mode mode)
CSR_OTP_GP_REG_OTP_ACCESS_MODE); CSR_OTP_GP_REG_OTP_ACCESS_MODE);
} }
static int iwlcore_get_nvm_type(struct iwl_priv *priv, u32 hw_rev) static int iwl_get_nvm_type(struct iwl_priv *priv, u32 hw_rev)
{ {
u32 otpgp; u32 otpgp;
int nvm_type; int nvm_type;
@ -431,7 +431,7 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)
u16 validblockaddr = 0; u16 validblockaddr = 0;
u16 cache_addr = 0; u16 cache_addr = 0;
priv->nvm_device_type = iwlcore_get_nvm_type(priv, hw_rev); priv->nvm_device_type = iwl_get_nvm_type(priv, hw_rev);
if (priv->nvm_device_type == -ENOENT) if (priv->nvm_device_type == -ENOENT)
return -ENOENT; return -ENOENT;
/* allocate eeprom */ /* allocate eeprom */

1
drivers/net/wireless/iwlwifi/iwl-eeprom.h
View File

@ -301,7 +301,6 @@ void iwl_eeprom_free(struct iwl_priv *priv);
int iwl_eeprom_check_version(struct iwl_priv *priv); int iwl_eeprom_check_version(struct iwl_priv *priv);
int iwl_eeprom_check_sku(struct iwl_priv *priv); int iwl_eeprom_check_sku(struct iwl_priv *priv);
const u8 *iwl_eeprom_query_addr(const struct iwl_priv *priv, size_t offset); const u8 *iwl_eeprom_query_addr(const struct iwl_priv *priv, size_t offset);
int iwlcore_eeprom_verify_signature(struct iwl_priv *priv);
u16 iwl_eeprom_query16(const struct iwl_priv *priv, size_t offset); u16 iwl_eeprom_query16(const struct iwl_priv *priv, size_t offset);
int iwl_init_channel_map(struct iwl_priv *priv); int iwl_init_channel_map(struct iwl_priv *priv);
void iwl_free_channel_map(struct iwl_priv *priv); void iwl_free_channel_map(struct iwl_priv *priv);