diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-02-18 18:22:07 -0500 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-09 19:11:57 -0500 |
commit | 4967c31677cf3c6c49aadf205f1a31d15d7610da (patch) | |
tree | ce42c267835f433e9c0c762cffae202a6b4c4e8c /drivers | |
parent | 60987206cba0dbb547bce2d23c3a3338c5aaf5ac (diff) |
iwlwifi: remove un-necessary parameters
small code cleanup to remove un-necessary parameters
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index 50d0ee96629e..d9255b53be10 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -658,7 +658,6 @@ static ssize_t iwl_dbgfs_qos_read(struct file *file, char __user *user_buf, | |||
658 | int pos = 0, i; | 658 | int pos = 0, i; |
659 | char buf[256]; | 659 | char buf[256]; |
660 | const size_t bufsz = sizeof(buf); | 660 | const size_t bufsz = sizeof(buf); |
661 | ssize_t ret; | ||
662 | 661 | ||
663 | for (i = 0; i < AC_NUM; i++) { | 662 | for (i = 0; i < AC_NUM; i++) { |
664 | pos += scnprintf(buf + pos, bufsz - pos, | 663 | pos += scnprintf(buf + pos, bufsz - pos, |
@@ -670,8 +669,7 @@ static ssize_t iwl_dbgfs_qos_read(struct file *file, char __user *user_buf, | |||
670 | priv->qos_data.def_qos_parm.ac[i].aifsn, | 669 | priv->qos_data.def_qos_parm.ac[i].aifsn, |
671 | priv->qos_data.def_qos_parm.ac[i].edca_txop); | 670 | priv->qos_data.def_qos_parm.ac[i].edca_txop); |
672 | } | 671 | } |
673 | ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); | 672 | return simple_read_from_buffer(user_buf, count, ppos, buf, pos); |
674 | return ret; | ||
675 | } | 673 | } |
676 | 674 | ||
677 | static ssize_t iwl_dbgfs_led_read(struct file *file, char __user *user_buf, | 675 | static ssize_t iwl_dbgfs_led_read(struct file *file, char __user *user_buf, |
@@ -681,7 +679,6 @@ static ssize_t iwl_dbgfs_led_read(struct file *file, char __user *user_buf, | |||
681 | int pos = 0; | 679 | int pos = 0; |
682 | char buf[256]; | 680 | char buf[256]; |
683 | const size_t bufsz = sizeof(buf); | 681 | const size_t bufsz = sizeof(buf); |
684 | ssize_t ret; | ||
685 | 682 | ||
686 | pos += scnprintf(buf + pos, bufsz - pos, | 683 | pos += scnprintf(buf + pos, bufsz - pos, |
687 | "allow blinking: %s\n", | 684 | "allow blinking: %s\n", |
@@ -695,8 +692,7 @@ static ssize_t iwl_dbgfs_led_read(struct file *file, char __user *user_buf, | |||
695 | priv->last_blink_time); | 692 | priv->last_blink_time); |
696 | } | 693 | } |
697 | 694 | ||
698 | ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); | 695 | return simple_read_from_buffer(user_buf, count, ppos, buf, pos); |
699 | return ret; | ||
700 | } | 696 | } |
701 | 697 | ||
702 | static ssize_t iwl_dbgfs_thermal_throttling_read(struct file *file, | 698 | static ssize_t iwl_dbgfs_thermal_throttling_read(struct file *file, |
@@ -709,7 +705,6 @@ static ssize_t iwl_dbgfs_thermal_throttling_read(struct file *file, | |||
709 | char buf[100]; | 705 | char buf[100]; |
710 | int pos = 0; | 706 | int pos = 0; |
711 | const size_t bufsz = sizeof(buf); | 707 | const size_t bufsz = sizeof(buf); |
712 | ssize_t ret; | ||
713 | 708 | ||
714 | pos += scnprintf(buf + pos, bufsz - pos, | 709 | pos += scnprintf(buf + pos, bufsz - pos, |
715 | "Thermal Throttling Mode: %s\n", | 710 | "Thermal Throttling Mode: %s\n", |
@@ -729,8 +724,7 @@ static ssize_t iwl_dbgfs_thermal_throttling_read(struct file *file, | |||
729 | "HT mode: %d\n", | 724 | "HT mode: %d\n", |
730 | restriction->is_ht); | 725 | restriction->is_ht); |
731 | } | 726 | } |
732 | ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); | 727 | return simple_read_from_buffer(user_buf, count, ppos, buf, pos); |
733 | return ret; | ||
734 | } | 728 | } |
735 | 729 | ||
736 | static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file, | 730 | static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file, |
@@ -767,13 +761,11 @@ static ssize_t iwl_dbgfs_disable_ht40_read(struct file *file, | |||
767 | char buf[100]; | 761 | char buf[100]; |
768 | int pos = 0; | 762 | int pos = 0; |
769 | const size_t bufsz = sizeof(buf); | 763 | const size_t bufsz = sizeof(buf); |
770 | ssize_t ret; | ||
771 | 764 | ||
772 | pos += scnprintf(buf + pos, bufsz - pos, | 765 | pos += scnprintf(buf + pos, bufsz - pos, |
773 | "11n 40MHz Mode: %s\n", | 766 | "11n 40MHz Mode: %s\n", |
774 | priv->disable_ht40 ? "Disabled" : "Enabled"); | 767 | priv->disable_ht40 ? "Disabled" : "Enabled"); |
775 | ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); | 768 | return simple_read_from_buffer(user_buf, count, ppos, buf, pos); |
776 | return ret; | ||
777 | } | 769 | } |
778 | 770 | ||
779 | static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file, | 771 | static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file, |
@@ -2049,7 +2041,6 @@ static ssize_t iwl_dbgfs_ucode_tracing_read(struct file *file, | |||
2049 | int pos = 0; | 2041 | int pos = 0; |
2050 | char buf[128]; | 2042 | char buf[128]; |
2051 | const size_t bufsz = sizeof(buf); | 2043 | const size_t bufsz = sizeof(buf); |
2052 | ssize_t ret; | ||
2053 | 2044 | ||
2054 | pos += scnprintf(buf + pos, bufsz - pos, "ucode trace timer is %s\n", | 2045 | pos += scnprintf(buf + pos, bufsz - pos, "ucode trace timer is %s\n", |
2055 | priv->event_log.ucode_trace ? "On" : "Off"); | 2046 | priv->event_log.ucode_trace ? "On" : "Off"); |
@@ -2060,8 +2051,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_read(struct file *file, | |||
2060 | pos += scnprintf(buf + pos, bufsz - pos, "wraps_more_count:\t\t %u\n", | 2051 | pos += scnprintf(buf + pos, bufsz - pos, "wraps_more_count:\t\t %u\n", |
2061 | priv->event_log.wraps_more_count); | 2052 | priv->event_log.wraps_more_count); |
2062 | 2053 | ||
2063 | ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); | 2054 | return simple_read_from_buffer(user_buf, count, ppos, buf, pos); |
2064 | return ret; | ||
2065 | } | 2055 | } |
2066 | 2056 | ||
2067 | static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file, | 2057 | static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file, |
@@ -2147,13 +2137,11 @@ static ssize_t iwl_dbgfs_missed_beacon_read(struct file *file, | |||
2147 | int pos = 0; | 2137 | int pos = 0; |
2148 | char buf[12]; | 2138 | char buf[12]; |
2149 | const size_t bufsz = sizeof(buf); | 2139 | const size_t bufsz = sizeof(buf); |
2150 | ssize_t ret; | ||
2151 | 2140 | ||
2152 | pos += scnprintf(buf + pos, bufsz - pos, "%d\n", | 2141 | pos += scnprintf(buf + pos, bufsz - pos, "%d\n", |
2153 | priv->missed_beacon_threshold); | 2142 | priv->missed_beacon_threshold); |
2154 | 2143 | ||
2155 | ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); | 2144 | return simple_read_from_buffer(user_buf, count, ppos, buf, pos); |
2156 | return ret; | ||
2157 | } | 2145 | } |
2158 | 2146 | ||
2159 | static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file, | 2147 | static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file, |
@@ -2211,13 +2199,11 @@ static ssize_t iwl_dbgfs_plcp_delta_read(struct file *file, | |||
2211 | int pos = 0; | 2199 | int pos = 0; |
2212 | char buf[12]; | 2200 | char buf[12]; |
2213 | const size_t bufsz = sizeof(buf); | 2201 | const size_t bufsz = sizeof(buf); |
2214 | ssize_t ret; | ||
2215 | 2202 | ||
2216 | pos += scnprintf(buf + pos, bufsz - pos, "%u\n", | 2203 | pos += scnprintf(buf + pos, bufsz - pos, "%u\n", |
2217 | priv->cfg->plcp_delta_threshold); | 2204 | priv->cfg->plcp_delta_threshold); |
2218 | 2205 | ||
2219 | ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); | 2206 | return simple_read_from_buffer(user_buf, count, ppos, buf, pos); |
2220 | return ret; | ||
2221 | } | 2207 | } |
2222 | 2208 | ||
2223 | static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file, | 2209 | static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file, |