Thread (2 messages) 2 messages, 2 authors, 2018-06-05

Re: [PATCH v2 06/21] iwlwifi: mvm: use match_string() helper

From: Andy Shevchenko <hidden>
Date: 2018-06-05 13:19:23
Also in: linux-wireless, lkml

On Thu, May 31, 2018 at 2:11 PM, Yisheng Xie [off-list ref] wrote:
match_string() returns the index of an array for a matching string,
which can be used instead of open coded variant.
Reviewed-by: Andy Shevchenko <redacted>
quoted hunk ↗ jump to hunk
Cc: Kalle Valo <redacted>
Cc: Intel Linux Wireless <redacted>
Cc: Johannes Berg <redacted>
Cc: Emmanuel Grumbach <redacted>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Yisheng Xie <redacted>
---
v2:
 - let ret get return value of match_string  - per Andy

 drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
index 0e6401c..d7ac511 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
@@ -671,16 +671,11 @@ static ssize_t iwl_dbgfs_bt_cmd_read(struct file *file, char __user *user_buf,
        };
        int ret, bt_force_ant_mode;

-       for (bt_force_ant_mode = 0;
-            bt_force_ant_mode < ARRAY_SIZE(modes_str);
-            bt_force_ant_mode++) {
-               if (!strcmp(buf, modes_str[bt_force_ant_mode]))
-                       break;
-       }
-
-       if (bt_force_ant_mode >= ARRAY_SIZE(modes_str))
-               return -EINVAL;
+       ret = match_string(modes_str, ARRAY_SIZE(modes_str), buf);
+       if (ret < 0)
+               return ret;

+       bt_force_ant_mode = ret;
        ret = 0;
        mutex_lock(&mvm->mutex);
        if (mvm->bt_force_ant_mode == bt_force_ant_mode)
--
1.7.12.4


-- 
With Best Regards,
Andy Shevchenko
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help