diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-04-02 08:53:08 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-23 17:20:39 -0400 |
commit | 0e9f6aca344f457ac5c1b747e171d7db72e773fd (patch) | |
tree | 87277bc3f13840028fb611c2cd934c2d41069d9c | |
parent | f9e75447d9ed3a70cb5f67b062d7504173730fdb (diff) |
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>
-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) | |||
474 | iwl_trans_set_pmi(priv->trans, state); | 474 | iwl_trans_set_pmi(priv->trans, state); |
475 | } | 475 | } |
476 | 476 | ||
477 | #ifdef CONFIG_IWLWIFI_DEBUGFS | ||
478 | int iwl_dbgfs_register(struct iwl_priv *priv, const char *name); | ||
479 | void iwl_dbgfs_unregister(struct iwl_priv *priv); | ||
480 | #else | ||
481 | static inline int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) | ||
482 | { | ||
483 | return 0; | ||
484 | } | ||
485 | static inline void iwl_dbgfs_unregister(struct iwl_priv *priv) | ||
486 | { | ||
487 | } | ||
488 | #endif /* CONFIG_IWLWIFI_DEBUGFS */ | ||
489 | |||
477 | #ifdef CONFIG_IWLWIFI_DEBUG | 490 | #ifdef CONFIG_IWLWIFI_DEBUG |
478 | #define IWL_DEBUG_QUIET_RFKILL(m, fmt, args...) \ | 491 | #define IWL_DEBUG_QUIET_RFKILL(m, fmt, args...) \ |
479 | do { \ | 492 | 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 @@ | |||
32 | #include "iwl-shared.h" | 32 | #include "iwl-shared.h" |
33 | #include "iwl-devtrace.h" | 33 | #include "iwl-devtrace.h" |
34 | 34 | ||
35 | struct iwl_priv; | ||
36 | |||
37 | void __iwl_err(struct device *dev, bool rfkill_prefix, bool only_trace, | 35 | void __iwl_err(struct device *dev, bool rfkill_prefix, bool only_trace, |
38 | const char *fmt, ...); | 36 | const char *fmt, ...); |
39 | void __iwl_warn(struct device *dev, const char *fmt, ...); | 37 | void __iwl_warn(struct device *dev, const char *fmt, ...); |
@@ -80,19 +78,6 @@ do { \ | |||
80 | #define iwl_print_hex_dump(m, level, p, len) | 78 | #define iwl_print_hex_dump(m, level, p, len) |
81 | #endif /* CONFIG_IWLWIFI_DEBUG */ | 79 | #endif /* CONFIG_IWLWIFI_DEBUG */ |
82 | 80 | ||
83 | #ifdef CONFIG_IWLWIFI_DEBUGFS | ||
84 | int iwl_dbgfs_register(struct iwl_priv *priv, const char *name); | ||
85 | void iwl_dbgfs_unregister(struct iwl_priv *priv); | ||
86 | #else | ||
87 | static inline int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) | ||
88 | { | ||
89 | return 0; | ||
90 | } | ||
91 | static inline void iwl_dbgfs_unregister(struct iwl_priv *priv) | ||
92 | { | ||
93 | } | ||
94 | #endif /* CONFIG_IWLWIFI_DEBUGFS */ | ||
95 | |||
96 | /* | 81 | /* |
97 | * To use the debug system: | 82 | * To use the debug system: |
98 | * | 83 | * |