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

Commit ee4d5471 authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: dvm: rename iwl_lib_ops to iwl_dvm_cfg 



The next patches will move some more configuration
data that isn't needed by mvm into this struct, so
rename it now since it won't just be ops.

Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8ade6285

drivers/net/wireless/iwlwifi/dvm/agn.h

+7 −7
Original line number Diff line number Diff line
@@ -76,13 +76,13 @@ 
#define IWL_INVALID_STATION	255



/* device operations */

extern struct iwl_lib_ops iwl1000_lib;

extern struct iwl_lib_ops iwl2000_lib;

extern struct iwl_lib_ops iwl2030_lib;

extern struct iwl_lib_ops iwl5000_lib;

extern struct iwl_lib_ops iwl5150_lib;

extern struct iwl_lib_ops iwl6000_lib;

extern struct iwl_lib_ops iwl6030_lib;

extern struct iwl_dvm_cfg iwl_dvm_1000_cfg;

extern struct iwl_dvm_cfg iwl_dvm_2000_cfg;

extern struct iwl_dvm_cfg iwl_dvm_2030_cfg;

extern struct iwl_dvm_cfg iwl_dvm_5000_cfg;

extern struct iwl_dvm_cfg iwl_dvm_5150_cfg;

extern struct iwl_dvm_cfg iwl_dvm_6000_cfg;

extern struct iwl_dvm_cfg iwl_dvm_6030_cfg;





#define TIME_UNIT		1024

drivers/net/wireless/iwlwifi/dvm/dev.h

+2 −2
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ struct iwl_hw_params { 
	const struct iwl_sensitivity_ranges *sens;

};



struct iwl_lib_ops {

struct iwl_dvm_cfg {

	/* set hw dependent parameters */

	void (*set_hw_params)(struct iwl_priv *priv);

	int (*set_channel_switch)(struct iwl_priv *priv,
@@ -610,7 +610,7 @@ struct iwl_priv { 
	struct device *dev;		/* for debug prints only */

	const struct iwl_cfg *cfg;

	const struct iwl_fw *fw;

	const struct iwl_lib_ops *lib;

	const struct iwl_dvm_cfg *lib;

	unsigned long status;



	spinlock_t sta_lock;

drivers/net/wireless/iwlwifi/dvm/devices.c

+7 −7
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static void iwl1000_hw_set_hw_params(struct iwl_priv *priv) 
	priv->hw_params.sens = &iwl1000_sensitivity;

}



struct iwl_lib_ops iwl1000_lib = {

struct iwl_dvm_cfg iwl_dvm_1000_cfg = {

	.set_hw_params = iwl1000_hw_set_hw_params,

	.nic_config = iwl1000_nic_config,

	.temperature = iwlagn_temperature,
@@ -232,13 +232,13 @@ static void iwl2000_hw_set_hw_params(struct iwl_priv *priv) 
	priv->hw_params.sens = &iwl2000_sensitivity;

}



struct iwl_lib_ops iwl2000_lib = {

struct iwl_dvm_cfg iwl_dvm_2000_cfg = {

	.set_hw_params = iwl2000_hw_set_hw_params,

	.nic_config = iwl2000_nic_config,

	.temperature = iwlagn_temperature,

};



struct iwl_lib_ops iwl2030_lib = {

struct iwl_dvm_cfg iwl_dvm_2030_cfg = {

	.set_hw_params = iwl2000_hw_set_hw_params,

	.nic_config = iwl2000_nic_config,

	.temperature = iwlagn_temperature,
@@ -420,13 +420,13 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, 
	return iwl_dvm_send_cmd(priv, &hcmd);

}



struct iwl_lib_ops iwl5000_lib = {

struct iwl_dvm_cfg iwl_dvm_5000_cfg = {

	.set_hw_params = iwl5000_hw_set_hw_params,

	.set_channel_switch = iwl5000_hw_channel_switch,

	.temperature = iwlagn_temperature,

};



struct iwl_lib_ops iwl5150_lib = {

struct iwl_dvm_cfg iwl_dvm_5150_cfg = {

	.set_hw_params = iwl5150_hw_set_hw_params,

	.set_channel_switch = iwl5000_hw_channel_switch,

	.temperature = iwl5150_temperature,
@@ -584,14 +584,14 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, 
	return err;

}



struct iwl_lib_ops iwl6000_lib = {

struct iwl_dvm_cfg iwl_dvm_6000_cfg = {

	.set_hw_params = iwl6000_hw_set_hw_params,

	.set_channel_switch = iwl6000_hw_channel_switch,

	.nic_config = iwl6000_nic_config,

	.temperature = iwlagn_temperature,

};



struct iwl_lib_ops iwl6030_lib = {

struct iwl_dvm_cfg iwl_dvm_6030_cfg = {

	.set_hw_params = iwl6000_hw_set_hw_params,

	.set_channel_switch = iwl6000_hw_channel_switch,

	.nic_config = iwl6000_nic_config,

drivers/net/wireless/iwlwifi/dvm/main.c

+7 −7
Original line number Diff line number Diff line
@@ -1264,31 +1264,31 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	switch (priv->cfg->device_family) {

	case IWL_DEVICE_FAMILY_1000:

	case IWL_DEVICE_FAMILY_100:

		priv->lib = &iwl1000_lib;

		priv->lib = &iwl_dvm_1000_cfg;

		break;

	case IWL_DEVICE_FAMILY_2000:

	case IWL_DEVICE_FAMILY_105:

		priv->lib = &iwl2000_lib;

		priv->lib = &iwl_dvm_2000_cfg;

		break;

	case IWL_DEVICE_FAMILY_2030:

	case IWL_DEVICE_FAMILY_135:

		priv->lib = &iwl2030_lib;

		priv->lib = &iwl_dvm_2030_cfg;

		break;

	case IWL_DEVICE_FAMILY_5000:

		priv->lib = &iwl5000_lib;

		priv->lib = &iwl_dvm_5000_cfg;

		break;

	case IWL_DEVICE_FAMILY_5150:

		priv->lib = &iwl5150_lib;

		priv->lib = &iwl_dvm_5150_cfg;

		break;

	case IWL_DEVICE_FAMILY_6000:

	case IWL_DEVICE_FAMILY_6005:

	case IWL_DEVICE_FAMILY_6000i:

	case IWL_DEVICE_FAMILY_6050:

	case IWL_DEVICE_FAMILY_6150:

		priv->lib = &iwl6000_lib;

		priv->lib = &iwl_dvm_6000_cfg;

		break;

	case IWL_DEVICE_FAMILY_6030:

		priv->lib = &iwl6030_lib;

		priv->lib = &iwl_dvm_6030_cfg;

		break;

	default:

		break;