iwlagn: remove dual-indirect call to simply the code

After driver split, no need to make the code so complex

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 692c30cb2fac..d6d2760c7c38 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -108,11 +108,6 @@ struct iwl_nic_ops {
         void (*additional_nic_config)(struct iwl_priv *priv);
 };
 
-struct iwl_ops {
-        const struct iwl_lib_ops *lib;
-        const struct iwl_nic_ops *nic;
-};
-
 struct iwl_mod_params {
         int sw_crypto;          /* def: 0 = using hardware encryption */
         int num_of_queues;      /* def: HW dependent */
@@ -247,7 +242,8 @@ struct iwl_cfg {
         u16  sku;
         u16  eeprom_ver;
         u16  eeprom_calib_ver;
-        const struct iwl_ops *ops;
+        const struct iwl_lib_ops *lib;
+        const struct iwl_nic_ops *nic;
         /* params not likely to change within a device family */
         struct iwl_base_params *base_params;
         /* params likely to change within a device family */