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

Commit 00b20a4d authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: remove watchdog debugfs file 



This file isn't really all that useful as
when the watchdog triggered it's already
too late, and the setting doesn't persist
unlike e.g. a module parameter that could
be added to the right config file.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b2cf410c

drivers/net/wireless/iwlwifi/iwl-debugfs.c

+0 −25
Original line number Diff line number Diff line
@@ -2347,29 +2347,6 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file, 
	return count;

}



static ssize_t iwl_dbgfs_wd_timeout_write(struct file *file,

					const char __user *user_buf,

					size_t count, loff_t *ppos)

{

	struct iwl_priv *priv = file->private_data;

	char buf[8];

	int buf_size;

	int timeout;



	memset(buf, 0, sizeof(buf));

	buf_size = min(count, sizeof(buf) -  1);

	if (copy_from_user(buf, user_buf, buf_size))

		return -EFAULT;

	if (sscanf(buf, "%d", &timeout) != 1)

		return -EINVAL;

	if (timeout < 0 || timeout > IWL_MAX_WD_TIMEOUT)

		timeout = IWL_DEF_WD_TIMEOUT;



	hw_params(priv).wd_timeout = timeout;

	iwl_setup_watchdog(priv);

	return count;

}



static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file,

					char __user *user_buf,

					size_t count, loff_t *ppos) {
@@ -2535,7 +2512,6 @@ DEBUGFS_READ_FILE_OPS(rxon_flags); 
DEBUGFS_READ_FILE_OPS(rxon_filter_flags);

DEBUGFS_WRITE_FILE_OPS(txfifo_flush);

DEBUGFS_READ_FILE_OPS(ucode_bt_stats);

DEBUGFS_WRITE_FILE_OPS(wd_timeout);

DEBUGFS_READ_FILE_OPS(bt_traffic);

DEBUGFS_READ_WRITE_FILE_OPS(protection_mode);

DEBUGFS_READ_FILE_OPS(reply_tx_error);
@@ -2602,7 +2578,6 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) 
	DEBUGFS_ADD_FILE(reply_tx_error, dir_debug, S_IRUSR);

	DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(wd_timeout, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(echo_test, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(log_event, dir_debug, S_IWUSR | S_IRUSR);