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

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

iwlagn: remove the indirection for update_chain_flags 



Not needed since the driver split.

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 bdfbf092

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

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ static struct iwl_lib_ops iwl1000_lib = { 
	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

	.update_chain_flags = iwl_update_chain_flags,

	.apm_ops = {

		.init = iwl_apm_init,

		.config = iwl1000_nic_config,

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

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ static struct iwl_lib_ops iwl2000_lib = { 
	.setup_deferred_work = iwlagn_bt_setup_deferred_work,

	.cancel_deferred_work = iwlagn_bt_cancel_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

	.update_chain_flags = iwl_update_chain_flags,

	.apm_ops = {

		.init = iwl_apm_init,

		.config = iwl2000_nic_config,

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

+0 −2
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ static struct iwl_lib_ops iwl5000_lib = { 
	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

	.update_chain_flags = iwl_update_chain_flags,

	.set_channel_switch = iwl5000_hw_channel_switch,

	.apm_ops = {

		.init = iwl_apm_init,
@@ -351,7 +350,6 @@ static struct iwl_lib_ops iwl5150_lib = { 
	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

	.update_chain_flags = iwl_update_chain_flags,

	.set_channel_switch = iwl5000_hw_channel_switch,

	.apm_ops = {

		.init = iwl_apm_init,

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

+0 −2
Original line number Diff line number Diff line
@@ -263,7 +263,6 @@ static struct iwl_lib_ops iwl6000_lib = { 
	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

	.update_chain_flags = iwl_update_chain_flags,

	.set_channel_switch = iwl6000_hw_channel_switch,

	.apm_ops = {

		.init = iwl_apm_init,
@@ -293,7 +292,6 @@ static struct iwl_lib_ops iwl6030_lib = { 
	.setup_deferred_work = iwlagn_bt_setup_deferred_work,

	.cancel_deferred_work = iwlagn_bt_cancel_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

	.update_chain_flags = iwl_update_chain_flags,

	.set_channel_switch = iwl6000_hw_channel_switch,

	.apm_ops = {

		.init = iwl_apm_init,

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

+1 −2
Original line number Diff line number Diff line
@@ -1001,8 +1001,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv) 
	/* Some power changes may have been made during the calibration.

	 * Update and commit the RXON

	 */

	if (priv->cfg->ops->lib->update_chain_flags)

		priv->cfg->ops->lib->update_chain_flags(priv);

	iwl_update_chain_flags(priv);



	data->state = IWL_CHAIN_NOISE_DONE;

	iwl_power_update_mode(priv, false);