diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-06-12 03:56:51 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-13 06:05:50 -0400 |
commit | 51cd53ad120f33410c48fd0d696e6f6255c8e780 (patch) | |
tree | 9271622e696002e527d77f1460ec3da402596ed4 /drivers/net/wireless/iwlwifi/dvm | |
parent | 12dcf2c3325a8aa25e8634b7e8337aad6f9be9b7 (diff) |
iwlwifi: reduce debug ifdefs using the optimiser
Instead of using #ifdef CONFIG_IWLWIFI_DEBUG, remove the
iwlwifi_mod_params.debug_level variable completely and
make iwl_have_debug_level() always return false in the
non-debug case. This way, the optimiser will elide all
code for it automatically without having to add #ifdefs.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm')
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/main.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c index 68f754659570..7aa9c8dc33ef 100644 --- a/drivers/net/wireless/iwlwifi/dvm/main.c +++ b/drivers/net/wireless/iwlwifi/dvm/main.c | |||
@@ -1859,14 +1859,9 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log, | |||
1859 | return pos; | 1859 | return pos; |
1860 | } | 1860 | } |
1861 | 1861 | ||
1862 | #ifdef CONFIG_IWLWIFI_DEBUG | ||
1863 | if (!(iwl_have_debug_level(IWL_DL_FW_ERRORS)) && !full_log) | 1862 | if (!(iwl_have_debug_level(IWL_DL_FW_ERRORS)) && !full_log) |
1864 | size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES) | 1863 | size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES) |
1865 | ? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size; | 1864 | ? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size; |
1866 | #else | ||
1867 | size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES) | ||
1868 | ? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size; | ||
1869 | #endif | ||
1870 | IWL_ERR(priv, "Start IWL Event Log Dump: display last %u entries\n", | 1865 | IWL_ERR(priv, "Start IWL Event Log Dump: display last %u entries\n", |
1871 | size); | 1866 | size); |
1872 | 1867 | ||
@@ -1910,10 +1905,8 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand) | |||
1910 | unsigned int reload_msec; | 1905 | unsigned int reload_msec; |
1911 | unsigned long reload_jiffies; | 1906 | unsigned long reload_jiffies; |
1912 | 1907 | ||
1913 | #ifdef CONFIG_IWLWIFI_DEBUG | ||
1914 | if (iwl_have_debug_level(IWL_DL_FW_ERRORS)) | 1908 | if (iwl_have_debug_level(IWL_DL_FW_ERRORS)) |
1915 | iwl_print_rx_config_cmd(priv, IWL_RXON_CTX_BSS); | 1909 | iwl_print_rx_config_cmd(priv, IWL_RXON_CTX_BSS); |
1916 | #endif | ||
1917 | 1910 | ||
1918 | /* uCode is no longer loaded. */ | 1911 | /* uCode is no longer loaded. */ |
1919 | priv->ucode_loaded = false; | 1912 | priv->ucode_loaded = false; |