diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-08-26 02:10:54 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-29 15:25:33 -0400 |
commit | 7ff94706a055f3e21710b08ffbe3979d7db615db (patch) | |
tree | 453cabac4b495e4ee8d7fe63a193435e90920883 /drivers/net/wireless/iwlwifi/iwl-debugfs.c | |
parent | 0c325769a394559941acda83e888a1d9b1ef8b7f (diff) |
iwlagn: move the NIC error flow to the transport layer
It is transport dependent, move to the PCIe transport layer.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@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/wireless/iwlwifi/iwl-debugfs.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index d3223214a801..fa070de2840c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -442,46 +442,6 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file, | |||
442 | return ret; | 442 | return ret; |
443 | } | 443 | } |
444 | 444 | ||
445 | static ssize_t iwl_dbgfs_log_event_read(struct file *file, | ||
446 | char __user *user_buf, | ||
447 | size_t count, loff_t *ppos) | ||
448 | { | ||
449 | struct iwl_priv *priv = file->private_data; | ||
450 | char *buf; | ||
451 | int pos = 0; | ||
452 | ssize_t ret = -ENOMEM; | ||
453 | |||
454 | ret = pos = iwl_dump_nic_event_log(priv, true, &buf, true); | ||
455 | if (buf) { | ||
456 | ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); | ||
457 | kfree(buf); | ||
458 | } | ||
459 | return ret; | ||
460 | } | ||
461 | |||
462 | static ssize_t iwl_dbgfs_log_event_write(struct file *file, | ||
463 | const char __user *user_buf, | ||
464 | size_t count, loff_t *ppos) | ||
465 | { | ||
466 | struct iwl_priv *priv = file->private_data; | ||
467 | u32 event_log_flag; | ||
468 | char buf[8]; | ||
469 | int buf_size; | ||
470 | |||
471 | memset(buf, 0, sizeof(buf)); | ||
472 | buf_size = min(count, sizeof(buf) - 1); | ||
473 | if (copy_from_user(buf, user_buf, buf_size)) | ||
474 | return -EFAULT; | ||
475 | if (sscanf(buf, "%d", &event_log_flag) != 1) | ||
476 | return -EFAULT; | ||
477 | if (event_log_flag == 1) | ||
478 | iwl_dump_nic_event_log(priv, true, NULL, false); | ||
479 | |||
480 | return count; | ||
481 | } | ||
482 | |||
483 | |||
484 | |||
485 | static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf, | 445 | static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf, |
486 | size_t count, loff_t *ppos) | 446 | size_t count, loff_t *ppos) |
487 | { | 447 | { |
@@ -870,7 +830,6 @@ static ssize_t iwl_dbgfs_current_sleep_command_read(struct file *file, | |||
870 | 830 | ||
871 | DEBUGFS_READ_WRITE_FILE_OPS(sram); | 831 | DEBUGFS_READ_WRITE_FILE_OPS(sram); |
872 | DEBUGFS_READ_FILE_OPS(wowlan_sram); | 832 | DEBUGFS_READ_FILE_OPS(wowlan_sram); |
873 | DEBUGFS_READ_WRITE_FILE_OPS(log_event); | ||
874 | DEBUGFS_READ_FILE_OPS(nvm); | 833 | DEBUGFS_READ_FILE_OPS(nvm); |
875 | DEBUGFS_READ_FILE_OPS(stations); | 834 | DEBUGFS_READ_FILE_OPS(stations); |
876 | DEBUGFS_READ_FILE_OPS(channels); | 835 | DEBUGFS_READ_FILE_OPS(channels); |
@@ -2509,7 +2468,6 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) | |||
2509 | DEBUGFS_ADD_FILE(nvm, dir_data, S_IRUSR); | 2468 | DEBUGFS_ADD_FILE(nvm, dir_data, S_IRUSR); |
2510 | DEBUGFS_ADD_FILE(sram, dir_data, S_IWUSR | S_IRUSR); | 2469 | DEBUGFS_ADD_FILE(sram, dir_data, S_IWUSR | S_IRUSR); |
2511 | DEBUGFS_ADD_FILE(wowlan_sram, dir_data, S_IRUSR); | 2470 | DEBUGFS_ADD_FILE(wowlan_sram, dir_data, S_IRUSR); |
2512 | DEBUGFS_ADD_FILE(log_event, dir_data, S_IWUSR | S_IRUSR); | ||
2513 | DEBUGFS_ADD_FILE(stations, dir_data, S_IRUSR); | 2471 | DEBUGFS_ADD_FILE(stations, dir_data, S_IRUSR); |
2514 | DEBUGFS_ADD_FILE(channels, dir_data, S_IRUSR); | 2472 | DEBUGFS_ADD_FILE(channels, dir_data, S_IRUSR); |
2515 | DEBUGFS_ADD_FILE(status, dir_data, S_IRUSR); | 2473 | DEBUGFS_ADD_FILE(status, dir_data, S_IRUSR); |