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

Commit b39488a9 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

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: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 107021c4

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

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static struct iwl_lib_ops iwl2000_lib = { 
			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

		.update_enhanced_txpower = iwl_eeprom_enhanced_txpower,

	},

	.temperature = iwlagn_temperature,

};
@@ -200,7 +200,7 @@ static struct iwl_lib_ops iwl2030_lib = { 
			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

		.update_enhanced_txpower = iwl_eeprom_enhanced_txpower,

	},

	.temperature = iwlagn_temperature,

};

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

+2 −2
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static struct iwl_lib_ops iwl6000_lib = { 
			EEPROM_6000_REG_BAND_24_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,

};
@@ -294,7 +294,7 @@ static struct iwl_lib_ops iwl6030_lib = { 
			EEPROM_6000_REG_BAND_24_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,

};

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

+3 −3
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static s8 iwl_get_max_txpower_avg(struct iwl_priv *priv, 
}



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,

				    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) \

			    ? # 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;

	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)

			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);

	}

}

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

+2 −2
Original line number Diff line number Diff line
@@ -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,

 *   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)

{

	__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)

{

	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");

		return 0;

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -3459,7 +3459,7 @@ static int iwl_init_drv(struct iwl_priv *priv) 
		goto err;

	}



	ret = iwlcore_init_geos(priv);

	ret = iwl_init_geos(priv);

	if (ret) {

		IWL_ERR(priv, "initializing geos failed: %d\n", ret);

		goto err_free_channel_map;
@@ -3477,7 +3477,7 @@ static int iwl_init_drv(struct iwl_priv *priv) 
static void iwl_uninit_drv(struct iwl_priv *priv)

{

	iwl_calib_free_results(priv);

	iwlcore_free_geos(priv);

	iwl_free_geos(priv);

	iwl_free_channel_map(priv);

	kfree(priv->scan_cmd);

	kfree(priv->beacon_cmd);