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

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

iwlagn: remove un-necessary ieee80211_ops 



After driver split, no need to use ieee80211_ops, remove it

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

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

+0 −1
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ static const struct iwl_ops iwl1000_ops = { 
	.lib = &iwl1000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static struct iwl_base_params iwl1000_base_params = {

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

+0 −4
Original line number Diff line number Diff line
@@ -304,28 +304,24 @@ static const struct iwl_ops iwl2000_ops = { 
	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl2030_ops = {

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl200_ops = {

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl230_ops = {

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static struct iwl_base_params iwl2000_base_params = {

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

+0 −2
Original line number Diff line number Diff line
@@ -436,14 +436,12 @@ static const struct iwl_ops iwl5000_ops = { 
	.lib = &iwl5000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl5150_ops = {

	.lib = &iwl5150_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static struct iwl_base_params iwl5000_base_params = {

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

+0 −4
Original line number Diff line number Diff line
@@ -386,7 +386,6 @@ static const struct iwl_ops iwl6000_ops = { 
	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl6050_ops = {
@@ -394,7 +393,6 @@ static const struct iwl_ops iwl6050_ops = { 
	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.nic = &iwl6050_nic_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl6150_ops = {
@@ -402,14 +400,12 @@ static const struct iwl_ops iwl6150_ops = { 
	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.nic = &iwl6150_nic_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl6030_ops = {

	.lib = &iwl6030_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static struct iwl_base_params iwl6000_base_params = {

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

+22 −0
Original line number Diff line number Diff line
@@ -3728,6 +3728,28 @@ static const u8 iwlagn_pan_ac_to_queue[] = { 
	7, 6, 5, 4,

};



/* This function both allocates and initializes hw and priv. */

static struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg)

{

	struct iwl_priv *priv;

	/* mac80211 allocates memory for this device instance, including

	 *   space for this driver's private structure */

	struct ieee80211_hw *hw;



	hw = ieee80211_alloc_hw(sizeof(struct iwl_priv), &iwlagn_hw_ops);

	if (hw == NULL) {

		pr_err("%s: Can not allocate network device\n",

		       cfg->name);

		goto out;

	}



	priv = hw->priv;

	priv->hw = hw;



out:

	return hw;

}



static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	int err = 0, i;