diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-04-02 16:53:08 +0400 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-24 01:20:39 +0400 |
| commit | 0e9f6aca344f457ac5c1b747e171d7db72e773fd (patch) | |
| tree | 87277bc3f13840028fb611c2cd934c2d41069d9c /drivers | |
| parent | f9e75447d9ed3a70cb5f67b062d7504173730fdb (diff) | |
| download | linux-0e9f6aca344f457ac5c1b747e171d7db72e773fd.tar.xz | |
iwlwifi: move debugfs registration function declarations
They clearly belong into iwl-agn.h as they have no
relation to the (generic) debug logging framework.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.h | 13 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debug.h | 15 |
2 files changed, 13 insertions, 15 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index bd467c0c519f..1db6bdec3cb6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h @@ -474,6 +474,19 @@ static inline void iwl_dvm_set_pmi(struct iwl_priv *priv, bool state) iwl_trans_set_pmi(priv->trans, state); } +#ifdef CONFIG_IWLWIFI_DEBUGFS +int iwl_dbgfs_register(struct iwl_priv *priv, const char *name); +void iwl_dbgfs_unregister(struct iwl_priv *priv); +#else +static inline int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) +{ + return 0; +} +static inline void iwl_dbgfs_unregister(struct iwl_priv *priv) +{ +} +#endif /* CONFIG_IWLWIFI_DEBUGFS */ + #ifdef CONFIG_IWLWIFI_DEBUG #define IWL_DEBUG_QUIET_RFKILL(m, fmt, args...) \ do { \ diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h index 8bae7cce4cb8..d3e1783b1500 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debug.h +++ b/drivers/net/wireless/iwlwifi/iwl-debug.h @@ -32,8 +32,6 @@ #include "iwl-shared.h" #include "iwl-devtrace.h" -struct iwl_priv; - void __iwl_err(struct device *dev, bool rfkill_prefix, bool only_trace, const char *fmt, ...); void __iwl_warn(struct device *dev, const char *fmt, ...); @@ -80,19 +78,6 @@ do { \ #define iwl_print_hex_dump(m, level, p, len) #endif /* CONFIG_IWLWIFI_DEBUG */ -#ifdef CONFIG_IWLWIFI_DEBUGFS -int iwl_dbgfs_register(struct iwl_priv *priv, const char *name); -void iwl_dbgfs_unregister(struct iwl_priv *priv); -#else -static inline int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) -{ - return 0; -} -static inline void iwl_dbgfs_unregister(struct iwl_priv *priv) -{ -} -#endif /* CONFIG_IWLWIFI_DEBUGFS */ - /* * To use the debug system: * |