diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-02-23 17:05:29 -0500 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-09 19:12:34 -0500 |
commit | 9856b7fa36a77d69e1413c63cb867514876796d2 (patch) | |
tree | b5a085c72989dc5af2ba2a4522da77edf81c71e6 | |
parent | f8e200de3af29c36ec93b72e3fc36350f8fbec84 (diff) |
iwlwifi: remove duplicate function
"internal_scan" debugfs function serves the same propose of mode "0" of
"force_reset" debugfs function. Remove it to avoid duplicate.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index d9255b53be10..5f5820249a29 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -2170,27 +2170,6 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file, | |||
2170 | return count; | 2170 | return count; |
2171 | } | 2171 | } |
2172 | 2172 | ||
2173 | static ssize_t iwl_dbgfs_internal_scan_write(struct file *file, | ||
2174 | const char __user *user_buf, | ||
2175 | size_t count, loff_t *ppos) | ||
2176 | { | ||
2177 | struct iwl_priv *priv = file->private_data; | ||
2178 | char buf[8]; | ||
2179 | int buf_size; | ||
2180 | int scan; | ||
2181 | |||
2182 | memset(buf, 0, sizeof(buf)); | ||
2183 | buf_size = min(count, sizeof(buf) - 1); | ||
2184 | if (copy_from_user(buf, user_buf, buf_size)) | ||
2185 | return -EFAULT; | ||
2186 | if (sscanf(buf, "%d", &scan) != 1) | ||
2187 | return -EINVAL; | ||
2188 | |||
2189 | iwl_internal_short_hw_scan(priv); | ||
2190 | |||
2191 | return count; | ||
2192 | } | ||
2193 | |||
2194 | static ssize_t iwl_dbgfs_plcp_delta_read(struct file *file, | 2173 | static ssize_t iwl_dbgfs_plcp_delta_read(struct file *file, |
2195 | char __user *user_buf, | 2174 | char __user *user_buf, |
2196 | size_t count, loff_t *ppos) { | 2175 | size_t count, loff_t *ppos) { |
@@ -2304,7 +2283,6 @@ DEBUGFS_WRITE_FILE_OPS(csr); | |||
2304 | DEBUGFS_READ_WRITE_FILE_OPS(ucode_tracing); | 2283 | DEBUGFS_READ_WRITE_FILE_OPS(ucode_tracing); |
2305 | DEBUGFS_READ_FILE_OPS(fh_reg); | 2284 | DEBUGFS_READ_FILE_OPS(fh_reg); |
2306 | DEBUGFS_READ_WRITE_FILE_OPS(missed_beacon); | 2285 | DEBUGFS_READ_WRITE_FILE_OPS(missed_beacon); |
2307 | DEBUGFS_WRITE_FILE_OPS(internal_scan); | ||
2308 | DEBUGFS_READ_WRITE_FILE_OPS(plcp_delta); | 2286 | DEBUGFS_READ_WRITE_FILE_OPS(plcp_delta); |
2309 | DEBUGFS_READ_WRITE_FILE_OPS(force_reset); | 2287 | DEBUGFS_READ_WRITE_FILE_OPS(force_reset); |
2310 | DEBUGFS_READ_FILE_OPS(rxon_flags); | 2288 | DEBUGFS_READ_FILE_OPS(rxon_flags); |
@@ -2360,7 +2338,6 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) | |||
2360 | DEBUGFS_ADD_FILE(csr, dir_debug, S_IWUSR); | 2338 | DEBUGFS_ADD_FILE(csr, dir_debug, S_IWUSR); |
2361 | DEBUGFS_ADD_FILE(fh_reg, dir_debug, S_IRUSR); | 2339 | DEBUGFS_ADD_FILE(fh_reg, dir_debug, S_IRUSR); |
2362 | DEBUGFS_ADD_FILE(missed_beacon, dir_debug, S_IWUSR); | 2340 | DEBUGFS_ADD_FILE(missed_beacon, dir_debug, S_IWUSR); |
2363 | DEBUGFS_ADD_FILE(internal_scan, dir_debug, S_IWUSR); | ||
2364 | DEBUGFS_ADD_FILE(plcp_delta, dir_debug, S_IWUSR | S_IRUSR); | 2341 | DEBUGFS_ADD_FILE(plcp_delta, dir_debug, S_IWUSR | S_IRUSR); |
2365 | DEBUGFS_ADD_FILE(force_reset, dir_debug, S_IWUSR | S_IRUSR); | 2342 | DEBUGFS_ADD_FILE(force_reset, dir_debug, S_IWUSR | S_IRUSR); |
2366 | if ((priv->hw_rev & CSR_HW_REV_TYPE_MSK) != CSR_HW_REV_TYPE_3945) { | 2343 | if ((priv->hw_rev & CSR_HW_REV_TYPE_MSK) != CSR_HW_REV_TYPE_3945) { |