summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/iwl-core.h
diff options
context:
space:
mode:
authorFry, Donald H <donald.h.fry@intel.com>2011-07-08 08:46:18 -0700
committerJohn W. Linville <linville@tuxdriver.com>2011-07-11 15:02:04 -0400
commite4c598b7ce36f4416f7672617265bc1fa92e5a5f (patch)
tree166df484e9e9ba56f0a435475b9d9a30ec353ce4 /drivers/net/wireless/iwlwifi/iwl-core.h
parent6b6db91c8aa14fa9bd041321026d69b9f6ea42ff (diff)
iwlagn: remove the indirection for iwl_apm_init
Not needed since the driver split. Signed-off-by: Don Fry <donald.h.fry@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index e1ab1a17e7f5..47cfbb9ddaf7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -96,11 +96,6 @@ struct iwl_hcmd_utils_ops {
int (*request_scan)(struct iwl_priv *priv, struct ieee80211_vif *vif);
};
-struct iwl_apm_ops {
- int (*init)(struct iwl_priv *priv);
- void (*config)(struct iwl_priv *priv);
-};
-
struct iwl_temp_ops {
void (*temperature)(struct iwl_priv *priv);
};
@@ -118,8 +113,8 @@ struct iwl_lib_ops {
int (*is_valid_rtc_data_addr)(u32 addr);
int (*set_channel_switch)(struct iwl_priv *priv,
struct ieee80211_channel_switch *ch_switch);
- /* power management */
- struct iwl_apm_ops apm_ops;
+ /* device specific configuration */
+ void (*nic_config)(struct iwl_priv *priv);
/* eeprom operations (as defined in iwl-eeprom.h) */
struct iwl_eeprom_ops eeprom_ops;