iwlwifi: move status check functions out of shared
They are only used in the DVM op_mode. Also move the rfkill debug macros that depend on them. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
0dde86b2f2
commit
84abd2cc06
|
@ -34,6 +34,7 @@
|
|||
|
||||
#include <net/mac80211.h>
|
||||
|
||||
#include "iwl-agn.h"
|
||||
#include "iwl-eeprom.h"
|
||||
#include "iwl-dev.h"
|
||||
#include "iwl-core.h"
|
||||
|
|
|
@ -383,4 +383,68 @@ static inline void iwl_print_rx_config_cmd(struct iwl_priv *priv,
|
|||
}
|
||||
#endif
|
||||
|
||||
/* status checks */
|
||||
|
||||
static inline int iwl_is_ready(struct iwl_shared *shrd)
|
||||
{
|
||||
/* The adapter is 'ready' if READY and GEO_CONFIGURED bits are
|
||||
* set but EXIT_PENDING is not */
|
||||
return test_bit(STATUS_READY, &shrd->status) &&
|
||||
test_bit(STATUS_GEO_CONFIGURED, &shrd->status) &&
|
||||
!test_bit(STATUS_EXIT_PENDING, &shrd->status);
|
||||
}
|
||||
|
||||
static inline int iwl_is_alive(struct iwl_shared *shrd)
|
||||
{
|
||||
return test_bit(STATUS_ALIVE, &shrd->status);
|
||||
}
|
||||
|
||||
static inline int iwl_is_init(struct iwl_shared *shrd)
|
||||
{
|
||||
return test_bit(STATUS_INIT, &shrd->status);
|
||||
}
|
||||
|
||||
static inline int iwl_is_rfkill_hw(struct iwl_shared *shrd)
|
||||
{
|
||||
return test_bit(STATUS_RF_KILL_HW, &shrd->status);
|
||||
}
|
||||
|
||||
static inline int iwl_is_rfkill(struct iwl_shared *shrd)
|
||||
{
|
||||
return iwl_is_rfkill_hw(shrd);
|
||||
}
|
||||
|
||||
static inline int iwl_is_ctkill(struct iwl_shared *shrd)
|
||||
{
|
||||
return test_bit(STATUS_CT_KILL, &shrd->status);
|
||||
}
|
||||
|
||||
static inline int iwl_is_ready_rf(struct iwl_shared *shrd)
|
||||
{
|
||||
if (iwl_is_rfkill(shrd))
|
||||
return 0;
|
||||
|
||||
return iwl_is_ready(shrd);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IWLWIFI_DEBUG
|
||||
#define IWL_DEBUG_QUIET_RFKILL(m, fmt, args...) \
|
||||
do { \
|
||||
if (!iwl_is_rfkill((m)->shrd)) \
|
||||
IWL_ERR(m, fmt, ##args); \
|
||||
else \
|
||||
__iwl_err(trans(m)->dev, true, \
|
||||
!iwl_have_debug_level(IWL_DL_RADIO), \
|
||||
fmt, ##args); \
|
||||
} while (0)
|
||||
#else
|
||||
#define IWL_DEBUG_QUIET_RFKILL(m, fmt, args...) \
|
||||
do { \
|
||||
if (!iwl_is_rfkill((m)->shrd)) \
|
||||
IWL_ERR(m, fmt, ##args); \
|
||||
else \
|
||||
__iwl_err(trans(m)->dev, true, true, fmt, ##args); \
|
||||
} while (0)
|
||||
#endif /* CONFIG_IWLWIFI_DEBUG */
|
||||
|
||||
#endif /* __iwl_agn_h__ */
|
||||
|
|
|
@ -76,24 +76,8 @@ do { \
|
|||
print_hex_dump(KERN_DEBUG, "iwl data: ", \
|
||||
DUMP_PREFIX_OFFSET, 16, 1, p, len, 1); \
|
||||
} while (0)
|
||||
#define IWL_DEBUG_QUIET_RFKILL(m, fmt, args...) \
|
||||
do { \
|
||||
if (!iwl_is_rfkill((m)->shrd)) \
|
||||
IWL_ERR(m, fmt, ##args); \
|
||||
else \
|
||||
__iwl_err(trans(m)->dev, true, \
|
||||
!iwl_have_debug_level(IWL_DL_RADIO), \
|
||||
fmt, ##args); \
|
||||
} while (0)
|
||||
#else
|
||||
#define iwl_print_hex_dump(m, level, p, len)
|
||||
#define IWL_DEBUG_QUIET_RFKILL(m, fmt, args...) \
|
||||
do { \
|
||||
if (!iwl_is_rfkill((m)->shrd)) \
|
||||
IWL_ERR(m, fmt, ##args); \
|
||||
else \
|
||||
__iwl_err(trans(m)->dev, true, true, fmt, ##args); \
|
||||
} while (0)
|
||||
#endif /* CONFIG_IWLWIFI_DEBUG */
|
||||
|
||||
#ifdef CONFIG_IWLWIFI_DEBUGFS
|
||||
|
|
|
@ -508,46 +508,4 @@ iwl_remove_notification(struct iwl_shared *shrd,
|
|||
#define STATUS_CHANNEL_SWITCH_PENDING 19
|
||||
#define STATUS_SCAN_COMPLETE 20
|
||||
|
||||
static inline int iwl_is_ready(struct iwl_shared *shrd)
|
||||
{
|
||||
/* The adapter is 'ready' if READY and GEO_CONFIGURED bits are
|
||||
* set but EXIT_PENDING is not */
|
||||
return test_bit(STATUS_READY, &shrd->status) &&
|
||||
test_bit(STATUS_GEO_CONFIGURED, &shrd->status) &&
|
||||
!test_bit(STATUS_EXIT_PENDING, &shrd->status);
|
||||
}
|
||||
|
||||
static inline int iwl_is_alive(struct iwl_shared *shrd)
|
||||
{
|
||||
return test_bit(STATUS_ALIVE, &shrd->status);
|
||||
}
|
||||
|
||||
static inline int iwl_is_init(struct iwl_shared *shrd)
|
||||
{
|
||||
return test_bit(STATUS_INIT, &shrd->status);
|
||||
}
|
||||
|
||||
static inline int iwl_is_rfkill_hw(struct iwl_shared *shrd)
|
||||
{
|
||||
return test_bit(STATUS_RF_KILL_HW, &shrd->status);
|
||||
}
|
||||
|
||||
static inline int iwl_is_rfkill(struct iwl_shared *shrd)
|
||||
{
|
||||
return iwl_is_rfkill_hw(shrd);
|
||||
}
|
||||
|
||||
static inline int iwl_is_ctkill(struct iwl_shared *shrd)
|
||||
{
|
||||
return test_bit(STATUS_CT_KILL, &shrd->status);
|
||||
}
|
||||
|
||||
static inline int iwl_is_ready_rf(struct iwl_shared *shrd)
|
||||
{
|
||||
if (iwl_is_rfkill(shrd))
|
||||
return 0;
|
||||
|
||||
return iwl_is_ready(shrd);
|
||||
}
|
||||
|
||||
#endif /* #__iwl_shared_h__ */
|
||||
|
|
Loading…
Reference in a new issue