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

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

iwlagn: remove the indirection for iwl_apm_init 



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 6b6db91c

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

+1 −4
Original line number Diff line number Diff line
@@ -171,10 +171,7 @@ 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,

	.apm_ops = {

		.init = iwl_apm_init,

		.config = iwl1000_nic_config,

	},

	.nic_config = iwl1000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

			EEPROM_REG_BAND_1_CHANNELS,

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

+1 −4
Original line number Diff line number Diff line
@@ -171,10 +171,7 @@ 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,

	.apm_ops = {

		.init = iwl_apm_init,

		.config = iwl2000_nic_config,

	},

	.nic_config = iwl2000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

			EEPROM_REG_BAND_1_CHANNELS,

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

+2 −8
Original line number Diff line number Diff line
@@ -324,10 +324,7 @@ static struct iwl_lib_ops iwl5000_lib = { 
	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

	.set_channel_switch = iwl5000_hw_channel_switch,

	.apm_ops = {

		.init = iwl_apm_init,

		.config = iwl5000_nic_config,

	},

	.nic_config = iwl5000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

			EEPROM_REG_BAND_1_CHANNELS,
@@ -351,10 +348,7 @@ static struct iwl_lib_ops iwl5150_lib = { 
	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

	.set_channel_switch = iwl5000_hw_channel_switch,

	.apm_ops = {

		.init = iwl_apm_init,

		.config = iwl5000_nic_config,

	},

	.nic_config = iwl5000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

			EEPROM_REG_BAND_1_CHANNELS,

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

+2 −8
Original line number Diff line number Diff line
@@ -264,10 +264,7 @@ static struct iwl_lib_ops iwl6000_lib = { 
	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

	.set_channel_switch = iwl6000_hw_channel_switch,

	.apm_ops = {

		.init = iwl_apm_init,

		.config = iwl6000_nic_config,

	},

	.nic_config = iwl6000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

			EEPROM_REG_BAND_1_CHANNELS,
@@ -293,10 +290,7 @@ static struct iwl_lib_ops iwl6030_lib = { 
	.cancel_deferred_work = iwlagn_bt_cancel_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

	.set_channel_switch = iwl6000_hw_channel_switch,

	.apm_ops = {

		.init = iwl_apm_init,

		.config = iwl6000_nic_config,

	},

	.nic_config = iwl6000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

			EEPROM_REG_BAND_1_CHANNELS,

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

+2 −2
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ int iwlagn_hw_nic_init(struct iwl_priv *priv) 


	/* nic_init */

	spin_lock_irqsave(&priv->lock, flags);

	priv->cfg->ops->lib->apm_ops.init(priv);

	iwl_apm_init(priv);



	/* Set interrupt coalescing calibration timer to default (512 usecs) */

	iwl_write8(priv, CSR_INT_COALESCING, IWL_HOST_INT_CALIB_TIMEOUT_DEF);
@@ -712,7 +712,7 @@ int iwlagn_hw_nic_init(struct iwl_priv *priv) 


	iwlagn_set_pwr_vmain(priv);



	priv->cfg->ops->lib->apm_ops.config(priv);

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



	/* Allocate the RX queue, or reset if it is already allocated */

	trans_rx_init(priv);