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

Commit 4caab328 authored by Fry, Donald H's avatar Fry, Donald H Committed by Wey-Yi Guy
Browse files

iwlagn: remove indirection for iwlagn_hw_valid_rtc_data_addr 



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>
parent 45d50024

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

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ static struct iwl_lib_ops iwl1000_lib = { 
	.set_hw_params = iwl1000_hw_set_hw_params,

	.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,

	.nic_config = iwl1000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

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

+0 −2
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ static struct iwl_lib_ops iwl2000_lib = { 
	.set_hw_params = iwl2000_hw_set_hw_params,

	.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,

	.nic_config = iwl2000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {
@@ -191,7 +190,6 @@ static struct iwl_lib_ops iwl2030_lib = { 
	.rx_handler_setup = iwlagn_bt_rx_handler_setup,

	.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,

	.nic_config = iwl2000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

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

+0 −2
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ static struct iwl_lib_ops iwl5000_lib = { 
	.set_hw_params = iwl5000_hw_set_hw_params,

	.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,

	.set_channel_switch = iwl5000_hw_channel_switch,

	.nic_config = iwl5000_nic_config,

	.eeprom_ops = {
@@ -343,7 +342,6 @@ static struct iwl_lib_ops iwl5150_lib = { 
	.set_hw_params = iwl5150_hw_set_hw_params,

	.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,

	.set_channel_switch = iwl5000_hw_channel_switch,

	.nic_config = iwl5000_nic_config,

	.eeprom_ops = {

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

+0 −2
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ static struct iwl_lib_ops iwl6000_lib = { 
	.set_hw_params = iwl6000_hw_set_hw_params,

	.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,

	.set_channel_switch = iwl6000_hw_channel_switch,

	.nic_config = iwl6000_nic_config,

	.eeprom_ops = {
@@ -283,7 +282,6 @@ static struct iwl_lib_ops iwl6030_lib = { 
	.rx_handler_setup = iwlagn_bt_rx_handler_setup,

	.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,

	.set_channel_switch = iwl6000_hw_channel_switch,

	.nic_config = iwl6000_nic_config,

	.eeprom_ops = {

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

+3 −3
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static void iwl_continuous_event_trace(struct iwl_priv *priv) 
	u32 next_entry; /* index of next entry to be written by uCode */



	base = priv->device_pointers.error_event_table;

	if (priv->cfg->lib->is_valid_rtc_data_addr(base)) {

	if (iwlagn_hw_valid_rtc_data_addr(base)) {

		capacity = iwl_read_targ_mem(priv, base);

		num_wraps = iwl_read_targ_mem(priv, base + (2 * sizeof(u32)));

		mode = iwl_read_targ_mem(priv, base + (1 * sizeof(u32)));
@@ -1614,7 +1614,7 @@ void iwl_dump_nic_error_log(struct iwl_priv *priv) 
			base = priv->_agn.inst_errlog_ptr;

	}



	if (!priv->cfg->lib->is_valid_rtc_data_addr(base)) {

	if (!iwlagn_hw_valid_rtc_data_addr(base)) {

		IWL_ERR(priv,

			"Not valid error log pointer 0x%08X for %s uCode\n",

			base,
@@ -1805,7 +1805,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log, 
			base = priv->_agn.inst_evtlog_ptr;

	}



	if (!priv->cfg->lib->is_valid_rtc_data_addr(base)) {

	if (!iwlagn_hw_valid_rtc_data_addr(base)) {

		IWL_ERR(priv,

			"Invalid event log pointer 0x%08X for %s uCode\n",

			base,