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

Commit 51dc51d1 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: make EEPROM enhanced TX power a bool 



There's no need to carry around the function
pointer when a boolean indicating that the
EEPROM stores enhanced TX power information
is sufficient.

Signed-off-by: default avatarJohannes Berg <johannes.berg@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 a75a79a8

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

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

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.update_enhanced_txpower = iwl_eeprom_enhanced_txpower,

		.enhanced_txpower = true,

	},

	.temperature = iwlagn_temperature,

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

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.update_enhanced_txpower = iwl_eeprom_enhanced_txpower,

		.enhanced_txpower = true,

	},

	.temperature = iwlagn_temperature,

};

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

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

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

		.update_enhanced_txpower = iwl_eeprom_enhanced_txpower,

		.enhanced_txpower = true,

	},

	.temperature = iwlagn_temperature,

};
@@ -264,7 +264,7 @@ static struct iwl_lib_ops iwl6030_lib = { 
			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

		.update_enhanced_txpower = iwl_eeprom_enhanced_txpower,

		.enhanced_txpower = true,

	},

	.temperature = iwlagn_temperature,

};

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

+0 −1
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags) 
}



/* eeprom */

void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv);

void iwl_eeprom_get_mac(const struct iwl_shared *shrd, u8 *mac);



extern int iwl_alive_start(struct iwl_priv *priv);

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

+3 −3
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ iwl_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 iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)

static void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)

{

	struct iwl_shared *shrd = priv->shrd;

	struct iwl_eeprom_enhanced_txpwr *txp_array, *txp;
@@ -1025,8 +1025,8 @@ int iwl_init_channel_map(struct iwl_priv *priv) 
	 * driver need to process addition information

	 * to determine the max channel tx power limits

	 */

	if (cfg(priv)->lib->eeprom_ops.update_enhanced_txpower)

		cfg(priv)->lib->eeprom_ops.update_enhanced_txpower(priv);

	if (cfg(priv)->lib->eeprom_ops.enhanced_txpower)

		iwl_eeprom_enhanced_txpower(priv);



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ extern const u8 iwl_eeprom_band_1[14]; 


struct iwl_eeprom_ops {

	const u32 regulatory_bands[7];

	void (*update_enhanced_txpower) (struct iwl_priv *priv);

	bool enhanced_txpower;

};