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

Commit 6bd4dba3 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlagn: kill iwlagn_setup_deferred_work 



Since iwlagn_setup_deferred_work is always called, fold it into
iwl_setup_deferred_work. BT related works are setup by the new
bt_setup_deferred_work lib_ops.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.guy@intel.com>
parent 8d301193

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

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 


static struct iwl_lib_ops iwl1000_lib = {

	.set_hw_params = iwl1000_hw_set_hw_params,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.nic_config = iwl1000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

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

+1 −2
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) 


static struct iwl_lib_ops iwl2000_lib = {

	.set_hw_params = iwl2000_hw_set_hw_params,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.nic_config = iwl2000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {
@@ -187,7 +186,7 @@ static struct iwl_lib_ops iwl2000_lib = { 
static struct iwl_lib_ops iwl2030_lib = {

	.set_hw_params = iwl2000_hw_set_hw_params,

	.bt_rx_handler_setup = iwlagn_bt_rx_handler_setup,

	.setup_deferred_work = iwlagn_bt_setup_deferred_work,

	.bt_setup_deferred_work = iwlagn_bt_setup_deferred_work,

	.cancel_deferred_work = iwlagn_bt_cancel_deferred_work,

	.nic_config = iwl2000_nic_config,

	.eeprom_ops = {

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

+0 −2
Original line number Diff line number Diff line
@@ -320,7 +320,6 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, 


static struct iwl_lib_ops iwl5000_lib = {

	.set_hw_params = iwl5000_hw_set_hw_params,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.set_channel_switch = iwl5000_hw_channel_switch,

	.nic_config = iwl5000_nic_config,

	.eeprom_ops = {
@@ -339,7 +338,6 @@ static struct iwl_lib_ops iwl5000_lib = { 


static struct iwl_lib_ops iwl5150_lib = {

	.set_hw_params = iwl5150_hw_set_hw_params,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.set_channel_switch = iwl5000_hw_channel_switch,

	.nic_config = iwl5000_nic_config,

	.eeprom_ops = {

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

+1 −2
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, 


static struct iwl_lib_ops iwl6000_lib = {

	.set_hw_params = iwl6000_hw_set_hw_params,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.set_channel_switch = iwl6000_hw_channel_switch,

	.nic_config = iwl6000_nic_config,

	.eeprom_ops = {
@@ -279,7 +278,7 @@ static struct iwl_lib_ops iwl6000_lib = { 
static struct iwl_lib_ops iwl6030_lib = {

	.set_hw_params = iwl6000_hw_set_hw_params,

	.bt_rx_handler_setup = iwlagn_bt_rx_handler_setup,

	.setup_deferred_work = iwlagn_bt_setup_deferred_work,

	.bt_setup_deferred_work = iwlagn_bt_setup_deferred_work,

	.cancel_deferred_work = iwlagn_bt_cancel_deferred_work,

	.set_channel_switch = iwl6000_hw_channel_switch,

	.nic_config = iwl6000_nic_config,

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

+0 −10
Original line number Diff line number Diff line
@@ -478,14 +478,6 @@ void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) 
	spin_unlock_irqrestore(&priv->sta_lock, flags);

}



void iwlagn_setup_deferred_work(struct iwl_priv *priv)

{

	/*

	 * nothing need to be done here anymore

	 * still keep for future use if needed

	 */

}



int iwlagn_hw_valid_rtc_data_addr(u32 addr)

{

	return (addr >= IWLAGN_RTC_DATA_LOWER_BOUND) &&
@@ -1754,8 +1746,6 @@ void iwlagn_bt_rx_handler_setup(struct iwl_priv *priv) 


void iwlagn_bt_setup_deferred_work(struct iwl_priv *priv)

{

	iwlagn_setup_deferred_work(priv);



	INIT_WORK(&priv->bt_traffic_change_work,

		  iwlagn_bt_traffic_change_work);

}