iwlwifi: remove redundant argument from iwl_dump_nic_event_log

We can check buf against NULL instead of having additional bool
variable.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/dvm/agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h
index e575b9b0cda8542c24693ce591272cd99ca1f486..48545ab003110559f4c5d097024c1066afbcd530 100644 (file)
--- a/drivers/net/wireless/iwlwifi/dvm/agn.h
+++ b/drivers/net/wireless/iwlwifi/dvm/agn.h
@@ -172,7 +172,7 @@ int iwl_calib_set(struct iwl_priv *priv,
                  const struct iwl_calib_hdr *cmd, int len);
 void iwl_calib_free_results(struct iwl_priv *priv);
 int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
-                           char **buf, bool display);
+                           char **buf);
 int iwlagn_hw_valid_rtc_data_addr(u32 addr);
 
 /* lib */

diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
index cb6dd5813fbc382e21533e22b071321de31038ca..17f04de272d89aa005aec8f873a054b6135efb51 100644 (file)
--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
@@ -2240,7 +2240,7 @@ static ssize_t iwl_dbgfs_log_event_read(struct file *file,
        char *buf = NULL;
        ssize_t ret;
 
-       ret = iwl_dump_nic_event_log(priv, true, &buf, true);
+       ret = iwl_dump_nic_event_log(priv, true, &buf);
        if (ret < 0)
                goto err;
        ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret);
@@ -2269,7 +2269,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
        if (sscanf(buf, "%d", &event_log_flag) != 1)
                return -EFAULT;
        if (event_log_flag == 1)
-               iwl_dump_nic_event_log(priv, true, NULL, false);
+               iwl_dump_nic_event_log(priv, true, NULL);
 
        return count;
 }

diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index b9e3517652d649f4514ea9b3608f479cc5c81991..74d7572e709125160f0a0db02b8e337d23d96cc5 100644 (file)
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -1795,7 +1795,7 @@ static int iwl_print_last_event_logs(struct iwl_priv *priv, u32 capacity,
 #define DEFAULT_DUMP_EVENT_LOG_ENTRIES (20)
 
 int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
-                           char **buf, bool display)
+                           char **buf)
 {
        u32 base;       /* SRAM byte address of event log header */
        u32 capacity;   /* event log capacity in # entries */
@@ -1866,7 +1866,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
                size);
 
 #ifdef CONFIG_IWLWIFI_DEBUG
-       if (display) {
+       if (buf) {
                if (full_log)
                        bufsz = capacity * 48;
                else
@@ -1962,7 +1962,7 @@ static void iwl_nic_error(struct iwl_op_mode *op_mode)
                priv->fw->fw_version);
 
        iwl_dump_nic_error_log(priv);
-       iwl_dump_nic_event_log(priv, false, NULL, false);
+       iwl_dump_nic_event_log(priv, false, NULL);
 
        iwlagn_fw_error(priv, false);
 }