Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6db0061 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Johannes Berg
Browse files

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: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3309ccf7

drivers/net/wireless/iwlwifi/dvm/agn.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/net/wireless/iwlwifi/dvm/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/wireless/iwlwifi/dvm/main.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

}