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

Commit e3f10cea authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: remove hcmd ops 



All "agn" devices use the same hcmd functions, no need to call indirectly.
remove hcmd_ops

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent e55b517c

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

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ static struct iwl_lib_ops iwl1000_lib = { 


static const struct iwl_ops iwl1000_ops = {

	.lib = &iwl1000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

};

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

+0 −4
Original line number Diff line number Diff line
@@ -198,25 +198,21 @@ static struct iwl_lib_ops iwl2000_lib = { 


static const struct iwl_ops iwl2000_ops = {

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

};



static const struct iwl_ops iwl2030_ops = {

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

};



static const struct iwl_ops iwl105_ops = {

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

};



static const struct iwl_ops iwl135_ops = {

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

};

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

+0 −2
Original line number Diff line number Diff line
@@ -379,13 +379,11 @@ static struct iwl_lib_ops iwl5150_lib = { 


static const struct iwl_ops iwl5000_ops = {

	.lib = &iwl5000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

};



static const struct iwl_ops iwl5150_ops = {

	.lib = &iwl5150_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

};

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

+0 −4
Original line number Diff line number Diff line
@@ -328,27 +328,23 @@ static struct iwl_nic_ops iwl6150_nic_ops = { 


static const struct iwl_ops iwl6000_ops = {

	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

};



static const struct iwl_ops iwl6050_ops = {

	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.nic = &iwl6050_nic_ops,

};



static const struct iwl_ops iwl6150_ops = {

	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.nic = &iwl6150_nic_ops,

};



static const struct iwl_ops iwl6030_ops = {

	.lib = &iwl6030_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

};

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

+1 −15
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int iwlagn_calc_rssi(struct iwl_priv *priv, 
	return max_rssi - agc - IWLAGN_RSSI_OFFSET;

}



static int iwlagn_set_pan_params(struct iwl_priv *priv)

int iwlagn_set_pan_params(struct iwl_priv *priv)

{

	struct iwl_wipan_params_cmd cmd;

	struct iwl_rxon_context *ctx_bss, *ctx_pan;
@@ -297,20 +297,6 @@ static int iwlagn_set_pan_params(struct iwl_priv *priv) 
	return ret;

}



struct iwl_hcmd_ops iwlagn_hcmd = {

	.set_rxon_chain = iwlagn_set_rxon_chain,

	.set_tx_ant = iwlagn_send_tx_ant_config,

	.send_bt_config = iwl_send_bt_config,

	.set_pan_params = iwlagn_set_pan_params,

};



struct iwl_hcmd_ops iwlagn_bt_hcmd = {

	.set_rxon_chain = iwlagn_set_rxon_chain,

	.set_tx_ant = iwlagn_send_tx_ant_config,

	.send_bt_config = iwlagn_send_advance_bt_config,

	.set_pan_params = iwlagn_set_pan_params,

};



struct iwl_hcmd_utils_ops iwlagn_hcmd_utils = {

	.build_addsta_hcmd = iwlagn_build_addsta_hcmd,

	.gain_computation = iwlagn_gain_computation,