diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-04-09 20:46:52 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 15:06:08 -0400 |
commit | 00b20a4de0fe0a0844cf1303b245ae15424fd63d (patch) | |
tree | c5141c123b4194a9eab23ff31837632d68bd34ea /drivers/net | |
parent | b2cf410ccb927141e69aa610b6dcf5137701f3af (diff) |
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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index d109d1bbb3a2..c674009b799c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -2347,29 +2347,6 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file, | |||
2347 | return count; | 2347 | return count; |
2348 | } | 2348 | } |
2349 | 2349 | ||
2350 | static ssize_t iwl_dbgfs_wd_timeout_write(struct file *file, | ||
2351 | const char __user *user_buf, | ||
2352 | size_t count, loff_t *ppos) | ||
2353 | { | ||
2354 | struct iwl_priv *priv = file->private_data; | ||
2355 | char buf[8]; | ||
2356 | int buf_size; | ||
2357 | int timeout; | ||
2358 | |||
2359 | memset(buf, 0, sizeof(buf)); | ||
2360 | buf_size = min(count, sizeof(buf) - 1); | ||
2361 | if (copy_from_user(buf, user_buf, buf_size)) | ||
2362 | return -EFAULT; | ||
2363 | if (sscanf(buf, "%d", &timeout) != 1) | ||
2364 | return -EINVAL; | ||
2365 | if (timeout < 0 || timeout > IWL_MAX_WD_TIMEOUT) | ||
2366 | timeout = IWL_DEF_WD_TIMEOUT; | ||
2367 | |||
2368 | hw_params(priv).wd_timeout = timeout; | ||
2369 | iwl_setup_watchdog(priv); | ||
2370 | return count; | ||
2371 | } | ||
2372 | |||
2373 | static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file, | 2350 | static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file, |
2374 | char __user *user_buf, | 2351 | char __user *user_buf, |
2375 | size_t count, loff_t *ppos) { | 2352 | size_t count, loff_t *ppos) { |
@@ -2535,7 +2512,6 @@ DEBUGFS_READ_FILE_OPS(rxon_flags); | |||
2535 | DEBUGFS_READ_FILE_OPS(rxon_filter_flags); | 2512 | DEBUGFS_READ_FILE_OPS(rxon_filter_flags); |
2536 | DEBUGFS_WRITE_FILE_OPS(txfifo_flush); | 2513 | DEBUGFS_WRITE_FILE_OPS(txfifo_flush); |
2537 | DEBUGFS_READ_FILE_OPS(ucode_bt_stats); | 2514 | DEBUGFS_READ_FILE_OPS(ucode_bt_stats); |
2538 | DEBUGFS_WRITE_FILE_OPS(wd_timeout); | ||
2539 | DEBUGFS_READ_FILE_OPS(bt_traffic); | 2515 | DEBUGFS_READ_FILE_OPS(bt_traffic); |
2540 | DEBUGFS_READ_WRITE_FILE_OPS(protection_mode); | 2516 | DEBUGFS_READ_WRITE_FILE_OPS(protection_mode); |
2541 | DEBUGFS_READ_FILE_OPS(reply_tx_error); | 2517 | DEBUGFS_READ_FILE_OPS(reply_tx_error); |
@@ -2602,7 +2578,6 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) | |||
2602 | DEBUGFS_ADD_FILE(reply_tx_error, dir_debug, S_IRUSR); | 2578 | DEBUGFS_ADD_FILE(reply_tx_error, dir_debug, S_IRUSR); |
2603 | DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR); | 2579 | DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR); |
2604 | DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR); | 2580 | DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR); |
2605 | DEBUGFS_ADD_FILE(wd_timeout, dir_debug, S_IWUSR); | ||
2606 | DEBUGFS_ADD_FILE(echo_test, dir_debug, S_IWUSR); | 2581 | DEBUGFS_ADD_FILE(echo_test, dir_debug, S_IWUSR); |
2607 | DEBUGFS_ADD_FILE(log_event, dir_debug, S_IWUSR | S_IRUSR); | 2582 | DEBUGFS_ADD_FILE(log_event, dir_debug, S_IWUSR | S_IRUSR); |
2608 | 2583 | ||