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

Commit 70e3e8a6 authored by Fry, Donald H's avatar Fry, Donald H Committed by John W. Linville
Browse files

iwlagn: remove indirection for eeprom_query_addr 



Not needed since the driver split.  Eliminate redundant routine.

Signed-off-by: default avatarDon Fry <donald.h.fry@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e4c598b7

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

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ static struct iwl_lib_ops iwl1000_lib = { 
			EEPROM_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.query_addr = iwlagn_eeprom_query_addr,

	},

	.temp_ops = {

		.temperature = iwlagn_temperature,

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

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ static struct iwl_lib_ops iwl2000_lib = { 
			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.query_addr = iwlagn_eeprom_query_addr,

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

	},

	.temp_ops = {

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

+0 −2
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ static struct iwl_lib_ops iwl5000_lib = { 
			EEPROM_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

		.query_addr = iwlagn_eeprom_query_addr,

	},

	.temp_ops = {

		.temperature = iwlagn_temperature,
@@ -359,7 +358,6 @@ static struct iwl_lib_ops iwl5150_lib = { 
			EEPROM_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

		.query_addr = iwlagn_eeprom_query_addr,

	},

	.temp_ops = {

		.temperature = iwl5150_temperature,

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

+0 −2
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ static struct iwl_lib_ops iwl6000_lib = { 
			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

		.query_addr = iwlagn_eeprom_query_addr,

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

	},

	.temp_ops = {
@@ -301,7 +300,6 @@ static struct iwl_lib_ops iwl6030_lib = { 
			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

		.query_addr = iwlagn_eeprom_query_addr,

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

	},

	.temp_ops = {

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

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ int iwl_eeprom_check_sku(struct iwl_priv *priv) 


void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac)

{

	const u8 *addr = priv->cfg->ops->lib->eeprom_ops.query_addr(priv,

	const u8 *addr = iwl_eeprom_query_addr(priv,

					EEPROM_MAC_ADDRESS);

	memcpy(mac, addr, ETH_ALEN);

}
@@ -245,10 +245,10 @@ void iwlcore_eeprom_enhanced_txpower(struct iwl_priv *priv) 
	BUILD_BUG_ON(sizeof(struct iwl_eeprom_enhanced_txpwr) != 8);



	/* the length is in 16-bit words, but we want entries */

	txp_len = (__le16 *) iwlagn_eeprom_query_addr(priv, EEPROM_TXP_SZ_OFFS);

	txp_len = (__le16 *) iwl_eeprom_query_addr(priv, EEPROM_TXP_SZ_OFFS);

	entries = le16_to_cpup(txp_len) * 2 / EEPROM_TXP_ENTRY_LEN;



	txp_array = (void *) iwlagn_eeprom_query_addr(priv, EEPROM_TXP_OFFS);

	txp_array = (void *) iwl_eeprom_query_addr(priv, EEPROM_TXP_OFFS);



	for (idx = 0; idx < entries; idx++) {

		txp = &txp_array[idx];