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

Commit 5c3d29fc authored by Don Fry's avatar Don Fry Committed by John W. Linville
Browse files

iwlagn: remove iwlagn_hcmd_utils structure and call directly 



Not needed since the driver split.  Move single use routines to
calling location and keep static where possible.

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 4e308119

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

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




static const struct iwl_ops iwl1000_ops = {

static const struct iwl_ops iwl1000_ops = {

	.lib = &iwl1000_lib,

	.lib = &iwl1000_lib,

	.utils = &iwlagn_hcmd_utils,

};

};





static struct iwl_base_params iwl1000_base_params = {

static struct iwl_base_params iwl1000_base_params = {

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -210,22 +210,18 @@ static struct iwl_lib_ops iwl2030_lib = { 




static const struct iwl_ops iwl2000_ops = {

static const struct iwl_ops iwl2000_ops = {

	.lib = &iwl2000_lib,

	.lib = &iwl2000_lib,

	.utils = &iwlagn_hcmd_utils,

};

};





static const struct iwl_ops iwl2030_ops = {

static const struct iwl_ops iwl2030_ops = {

	.lib = &iwl2030_lib,

	.lib = &iwl2030_lib,

	.utils = &iwlagn_hcmd_utils,

};

};





static const struct iwl_ops iwl105_ops = {

static const struct iwl_ops iwl105_ops = {

	.lib = &iwl2000_lib,

	.lib = &iwl2000_lib,

	.utils = &iwlagn_hcmd_utils,

};

};





static const struct iwl_ops iwl135_ops = {

static const struct iwl_ops iwl135_ops = {

	.lib = &iwl2030_lib,

	.lib = &iwl2030_lib,

	.utils = &iwlagn_hcmd_utils,

};

};





static struct iwl_base_params iwl2000_base_params = {

static struct iwl_base_params iwl2000_base_params = {

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -362,12 +362,10 @@ static struct iwl_lib_ops iwl5150_lib = { 




static const struct iwl_ops iwl5000_ops = {

static const struct iwl_ops iwl5000_ops = {

	.lib = &iwl5000_lib,

	.lib = &iwl5000_lib,

	.utils = &iwlagn_hcmd_utils,

};

};





static const struct iwl_ops iwl5150_ops = {

static const struct iwl_ops iwl5150_ops = {

	.lib = &iwl5150_lib,

	.lib = &iwl5150_lib,

	.utils = &iwlagn_hcmd_utils,

};

};





static struct iwl_base_params iwl5000_base_params = {

static struct iwl_base_params iwl5000_base_params = {

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -313,24 +313,20 @@ static struct iwl_nic_ops iwl6150_nic_ops = { 




static const struct iwl_ops iwl6000_ops = {

static const struct iwl_ops iwl6000_ops = {

	.lib = &iwl6000_lib,

	.lib = &iwl6000_lib,

	.utils = &iwlagn_hcmd_utils,

};

};





static const struct iwl_ops iwl6050_ops = {

static const struct iwl_ops iwl6050_ops = {

	.lib = &iwl6000_lib,

	.lib = &iwl6000_lib,

	.utils = &iwlagn_hcmd_utils,

	.nic = &iwl6050_nic_ops,

	.nic = &iwl6050_nic_ops,

};

};





static const struct iwl_ops iwl6150_ops = {

static const struct iwl_ops iwl6150_ops = {

	.lib = &iwl6000_lib,

	.lib = &iwl6000_lib,

	.utils = &iwlagn_hcmd_utils,

	.nic = &iwl6150_nic_ops,

	.nic = &iwl6150_nic_ops,

};

};





static const struct iwl_ops iwl6030_ops = {

static const struct iwl_ops iwl6030_ops = {

	.lib = &iwl6030_lib,

	.lib = &iwl6030_lib,

	.utils = &iwlagn_hcmd_utils,

};

};





static struct iwl_base_params iwl6000_base_params = {

static struct iwl_base_params iwl6000_base_params = {

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include "iwl-core.h"

#include "iwl-core.h"

#include "iwl-agn-calib.h"

#include "iwl-agn-calib.h"

#include "iwl-trans.h"

#include "iwl-trans.h"

#include "iwl-agn.h"





/*****************************************************************************

/*****************************************************************************

 * INIT calibrations framework

 * INIT calibrations framework
@@ -993,8 +994,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv) 
	IWL_DEBUG_CALIB(priv, "min_average_noise = %d, antenna %d\n",

	IWL_DEBUG_CALIB(priv, "min_average_noise = %d, antenna %d\n",

			min_average_noise, min_average_noise_antenna_i);

			min_average_noise, min_average_noise_antenna_i);





	if (priv->cfg->ops->utils->gain_computation)

	iwlagn_gain_computation(priv, average_noise,

		priv->cfg->ops->utils->gain_computation(priv, average_noise,

				min_average_noise_antenna_i, min_average_noise,

				min_average_noise_antenna_i, min_average_noise,

				find_first_chain(priv->cfg->valid_rx_ant));

				find_first_chain(priv->cfg->valid_rx_ant));