Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[sfrench/cifs-2.6.git] / drivers / net / wireless / iwlwifi / iwl-power.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-power.h b/drivers/net/wireless/iwlwifi/iwl-power.h
index 18963392121e9606b258d6764491e72282d1d2e5..37ba3bb7a25a1f353986235d9326f869c019dd54 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-power.h
+++ b/drivers/net/wireless/iwlwifi/iwl-power.h
@@ -40,56 +40,29 @@ enum {
        IWL_POWER_INDEX_3,
        IWL_POWER_INDEX_4,
        IWL_POWER_INDEX_5,
-       IWL_POWER_AUTO,
-       IWL_POWER_MAX = IWL_POWER_AUTO,
+       IWL_POWER_NUM
 };
 
-enum {
-       IWL_POWER_SYS_AUTO,
-       IWL_POWER_SYS_AC,
-       IWL_POWER_SYS_BATTERY,
-       IWL_POWER_SYS_MAX,
-};
-
-
 /* Power management (not Tx power) structures */
 
-#define NOSLP cpu_to_le16(0), 0, 0
-#define SLP IWL_POWER_DRIVER_ALLOW_SLEEP_MSK, 0, 0
-#define SLP_TOUT(T) cpu_to_le32((T) * MSEC_TO_USEC)
-#define SLP_VEC(X0, X1, X2, X3, X4) {cpu_to_le32(X0), \
-                                    cpu_to_le32(X1), \
-                                    cpu_to_le32(X2), \
-                                    cpu_to_le32(X3), \
-                                    cpu_to_le32(X4)}
 struct iwl_power_vec_entry {
        struct iwl_powertable_cmd cmd;
        u8 no_dtim;
 };
 
 struct iwl_power_mgr {
-       spinlock_t lock;
-       struct iwl_power_vec_entry pwr_range_0[IWL_POWER_MAX];
-       struct iwl_power_vec_entry pwr_range_1[IWL_POWER_MAX];
-       struct iwl_power_vec_entry pwr_range_2[IWL_POWER_MAX];
+       struct iwl_power_vec_entry pwr_range_0[IWL_POWER_NUM];
+       struct iwl_power_vec_entry pwr_range_1[IWL_POWER_NUM];
+       struct iwl_power_vec_entry pwr_range_2[IWL_POWER_NUM];
        u32 dtim_period;
        /* final power level that used to calculate final power command */
        u8 power_mode;
-       u8 user_power_setting; /* set by user through mac80211 or sysfs */
-       u8 system_power_setting; /* set by kernel system tools */
-       u8 critical_power_setting; /* set if driver over heated */
-       u8 is_battery_active; /* DC/AC power */
-       u8 power_disabled; /* flag to disable using power saving level */
+       u8 user_power_setting; /* set by user through sysfs */
+       u8 power_disabled; /* set by mac80211's CONF_PS */
 };
 
-void iwl_setup_power_deferred_work(struct iwl_priv *priv);
-void iwl_power_cancel_timeout(struct iwl_priv *priv);
 int iwl_power_update_mode(struct iwl_priv *priv, bool force);
-int iwl_power_disable_management(struct iwl_priv *priv, u32 ms);
-int iwl_power_enable_management(struct iwl_priv *priv);
 int iwl_power_set_user_mode(struct iwl_priv *priv, u16 mode);
-int iwl_power_set_system_mode(struct iwl_priv *priv, u16 mode);
 void iwl_power_initialize(struct iwl_priv *priv);
-int iwl_power_temperature_change(struct iwl_priv *priv);
 
 #endif  /* __iwl_power_setting_h__ */