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

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

iwlagn: remove double level temperature indirect call 



No need to do double level indirect call after driver split
no functional changes

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 70e3e8a6

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

+1 −3
Original line number Diff line number Diff line
@@ -183,9 +183,7 @@ static struct iwl_lib_ops iwl1000_lib = { 
			EEPROM_REGULATORY_BAND_NO_HT40,

		},

	},

	.temp_ops = {

	.temperature = iwlagn_temperature,

	 },

};



static const struct iwl_ops iwl1000_ops = {

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

+1 −3
Original line number Diff line number Diff line
@@ -184,9 +184,7 @@ static struct iwl_lib_ops iwl2000_lib = { 
		},

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

	},

	.temp_ops = {

	.temperature = iwlagn_temperature,

	},

};



static const struct iwl_ops iwl2000_ops = {

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

+2 −6
Original line number Diff line number Diff line
@@ -336,9 +336,7 @@ static struct iwl_lib_ops iwl5000_lib = { 
			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

	},

	.temp_ops = {

	.temperature = iwlagn_temperature,

	 },

};



static struct iwl_lib_ops iwl5150_lib = {
@@ -359,9 +357,7 @@ static struct iwl_lib_ops iwl5150_lib = { 
			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

	},

	.temp_ops = {

	.temperature = iwl5150_temperature,

	 },

};



static const struct iwl_ops iwl5000_ops = {

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

+2 −6
Original line number Diff line number Diff line
@@ -277,9 +277,7 @@ static struct iwl_lib_ops iwl6000_lib = { 
		},

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

	},

	.temp_ops = {

	.temperature = iwlagn_temperature,

	 },

};



static struct iwl_lib_ops iwl6030_lib = {
@@ -302,9 +300,7 @@ static struct iwl_lib_ops iwl6030_lib = { 
		},

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

	},

	.temp_ops = {

	.temperature = iwlagn_temperature,

	 },

};



static struct iwl_nic_ops iwl6050_nic_ops = {

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

+1 −5
Original line number Diff line number Diff line
@@ -96,10 +96,6 @@ struct iwl_hcmd_utils_ops { 
	int (*request_scan)(struct iwl_priv *priv, struct ieee80211_vif *vif);

};



struct iwl_temp_ops {

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

};



struct iwl_lib_ops {

	/* set hw dependent parameters */

	int (*set_hw_params)(struct iwl_priv *priv);
@@ -120,7 +116,7 @@ struct iwl_lib_ops { 
	struct iwl_eeprom_ops eeprom_ops;



	/* temperature */

	struct iwl_temp_ops temp_ops;

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

};



/* NIC specific ops */