Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / wireless / iwlwifi / iwl-core.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index e1ab1a1..692c30c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -80,31 +80,6 @@ struct iwl_cmd;
 
 #define IWL_CMD(x) case x: return #x
 
-struct iwl_hcmd_utils_ops {
-       u16 (*build_addsta_hcmd)(const struct iwl_addsta_cmd *cmd, u8 *data);
-       void (*gain_computation)(struct iwl_priv *priv,
-                       u32 *average_noise,
-                       u16 min_average_noise_antennat_i,
-                       u32 min_average_noise,
-                       u8 default_chain);
-       void (*chain_noise_reset)(struct iwl_priv *priv);
-       void (*tx_cmd_protection)(struct iwl_priv *priv,
-                                 struct ieee80211_tx_info *info,
-                                 __le16 fc, __le32 *tx_flags);
-       int  (*calc_rssi)(struct iwl_priv *priv,
-                         struct iwl_rx_phy_res *rx_resp);
-       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);
-};
-
 struct iwl_lib_ops {
        /* set hw dependent parameters */
        int (*set_hw_params)(struct iwl_priv *priv);
@@ -118,14 +93,14 @@ 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;
 
        /* temperature */
-       struct iwl_temp_ops temp_ops;
+       void (*temperature)(struct iwl_priv *priv);
 };
 
 /* NIC specific ops */
@@ -135,7 +110,6 @@ struct iwl_nic_ops {
 
 struct iwl_ops {
        const struct iwl_lib_ops *lib;
-       const struct iwl_hcmd_utils_ops *utils;
        const struct iwl_nic_ops *nic;
 };