use match_string() helper

drivers/usb/phy/of.c line 31

Quoted 5 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

drivers/usb/phy/of.c +1 -1

-       int err, i;
+       int ret;

int err;

would still work.

Quoted 4 lines · Andy Shevchenko

Quoted 2 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Quoted 6 lines

drivers/usb/phy/of.c line 31

Quoted 2 lines

drivers/usb/phy/of.c +1 -1

-       int err, i;
+       int ret;

int err;

would still work.

And it reduces churn.

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Tony Lindgren <[email protected]>

Cc Lee Jones <[email protected]>

Cc [email protected]

Signed-off-by Yisheng Xie <[email protected]>

---
 drivers/mfd/omap-usb-host.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Linus Walleij <[email protected]>

Cc [email protected]

Signed-off-by Yisheng Xie <[email protected]>

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c +0 -5

-       for (i = 0; i < ARRAY_SIZE(cudbg_region); i++) {
-               if (!strcmp(cudbg_region[i], region_name)) {
-                       found = 1;
-                       idx = i;
-                       break;

Quoted 16 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c +3 -9

-       for (i = 0; i < ARRAY_SIZE(cudbg_region); i++) {
-               if (!strcmp(cudbg_region[i], region_name)) {
-                       found = 1;
-                       idx = i;
-                       break;
-               }
-       }
-       if (!found)
-               return -EINVAL;
+       rc = match_string(cudbg_region, ARRAY_SIZE(cudbg_region), region_name);
+       if (rc < 0)
+               return rc;

drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c static int cudbg_get_mem_region(struct adapter *padap, · line 789

Quoted 2 lines

drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c +1 -1

-       found = 0;
+       idx = rc;

Is found still in use after this?
If so, is it initialized properly now?

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Kalle Valo <[email protected]>

Cc Intel Linux Wireless <[email protected]>

Cc Johannes Berg <[email protected]>

Cc Emmanuel Grumbach <[email protected]>

Cc [email protected]

Cc [email protected]

Signed-off-by Yisheng Xie <[email protected]>

---
 drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +3 -8

index 0e6401c..e8249a6 100644
@@ -671,14 +671,9 @@ 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))
+	bt_force_ant_mode = match_string(modes_str,
+					 ARRAY_SIZE(modes_str),
 buf);
+	if (bt_force_ant_mode < 0)
 		return -EINVAL;

ret = 0;

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

        int ret, bt_force_ant_mode;

drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +0 -1

-       for (bt_force_ant_mode = 0;

+ if (bt_force_ant_mode < 0)

                return -EINVAL;

        ret = 0;

Quoted 13 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

        int ret, bt_force_ant_mode;

drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +0 -8

-       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))

drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c static ssize_t iwl_dbgfs_bt_cmd_read(struct file *file, char __user *user_buf, · line 675

Quoted 2 lines

drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +2 -0

+       bt_force_ant_mode = match_string(modes_str,
+                                        ARRAY_SIZE(modes_str), buf);

One line?

Quoted 3 lines

+ if (bt_force_ant_mode < 0)

                return -EINVAL;

I would rather use

ret = match_string();
if (ret < 0)
return ret;

bt_force_... = ret;

But it's up tu Loca.

Quoted 3 lines

        ret = 0;

Quoted 1 line

But it's up tu Loca.

OK, I will change it if Loca agree your opinion.

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Alex Williamson <[email protected]>

Cc [email protected]

Signed-off-by Yisheng Xie <[email protected]>

---
 drivers/vfio/vfio.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

drivers/vfio/vfio.c +3 -8

index 721f97f..6483387 100644
@@ -630,8 +630,6 @@ static struct vfio_device *vfio_group_get_device(struct vfio_group *group,
 
 static bool vfio_dev_whitelisted(struct device *dev, struct device_driver *drv)
 {
-	int i;
-
 	if (dev_is_pci(dev)) {
 		struct pci_dev *pdev = to_pci_dev(dev);
 

@@ -639,12 +637,9 @@ static bool vfio_dev_whitelisted(struct device *dev, struct device_driver *drv)
 			return true;
 	}
 
-	for (i = 0; i < ARRAY_SIZE(vfio_driver_whitelist); i++) {
-		if (!strcmp(drv->name, vfio_driver_whitelist[i]))
-			return true;
-	}
-
-	return false;
+	return match_string(vfio_driver_whitelist,
+			    ARRAY_SIZE(vfio_driver_whitelist),
+			    drv->name) >= 0;
 }
 
 /*

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Kishon Vijay Abraham I <[email protected]>

Cc Thierry Reding <[email protected]>

Cc Jonathan Hunter <[email protected]>

Cc [email protected]

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Bartlomiej Zolnierkiewicz <[email protected]>

Cc Tejun Heo <[email protected]>

Cc [email protected]

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Michael Turquette <[email protected]>

Cc Stephen Boyd <[email protected]>

Cc Eric Anholt <[email protected]>

Cc Stefan Wahren <[email protected]>

Cc linux-clk at vger.kernel.org

Cc linux-rpi-kernel at lists.infradead.org

Cc linux-arm-kernel at lists.infradead.org

Signed-off-by Yisheng Xie <[email protected]>

---
 drivers/clk/bcm/clk-bcm2835.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

drivers/clk/bcm/clk-bcm2835.c +1 -3

index fa0d5c8..a27c0d2 100644
@@ -1395,8 +1395,7 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman,
 	struct bcm2835_clock *clock;
 	struct clk_init_data init;
 	const char *parents[1 << CM_SRC_BITS];
-	size_t i, j;
-	int ret;
+	int i, ret;
 
 	/*
 	 * Replace our strings referencing parent clocks with the

@@ -1405,12 +1404,11 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman,
 	for (i = 0; i < data->num_mux_parents; i++) {
 		parents[i] = data->parents[i];
 
-		for (j = 0; j < ARRAY_SIZE(cprman_parent_names); j++) {

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Michael Turquette <[email protected]>

Cc Stephen Boyd <[email protected]>

Cc Eric Anholt <[email protected]>

Cc Stefan Wahren <[email protected]>

Cc linux-clk at vger.kernel.org

Cc linux-rpi-kernel at lists.infradead.org

Cc linux-arm-kernel at lists.infradead.org

Signed-off-by Yisheng Xie <[email protected]>

drivers/clk/bcm/clk-bcm2835.c +5 -0

+               ret = match_string(cprman_parent_names,
+                                  ARRAY_SIZE(cprman_parent_names),
+                                  parents[i]);
+               if (ret >= 0)
+                       parents[i] = cprman->real_parent_names[ret];

Quoted 11 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Michael Turquette <[email protected]>

Cc Stephen Boyd <[email protected]>

Cc Eric Anholt <[email protected]>

Cc Stefan Wahren <[email protected]>

Cc linux-clk at vger.kernel.org

Cc linux-rpi-kernel at lists.infradead.org

Cc linux-arm-kernel at lists.infradead.org

Signed-off-by Yisheng Xie <[email protected]>

drivers/clk/bcm/clk-bcm2835.c static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman, · line 1398

Quoted 3 lines

drivers/clk/bcm/clk-bcm2835.c +1 -2

-       size_t i, j;
-       int ret;
+       int i, ret;

I do not see any need to change type for i.

Quoted 6 lines

drivers/clk/bcm/clk-bcm2835.c +5 -0

+               ret = match_string(cprman_parent_names,
+                                  ARRAY_SIZE(cprman_parent_names),
+                                  parents[i]);
+               if (ret >= 0)
+                       parents[i] = cprman->real_parent_names[ret];

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Michael Turquette <[email protected]>

Cc Stephen Boyd <[email protected]>

Cc Heiko Stuebner <[email protected]>

Cc linux-clk at vger.kernel.org

Cc linux-arm-kernel at lists.infradead.org

Cc linux-rockchip at lists.infradead.org

Signed-off-by Yisheng Xie <[email protected]>

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Adrian Hunter <[email protected]>

Cc Hu Ziji <[email protected]>

Cc Ulf Hansson <[email protected]>

Cc [email protected]

Signed-off-by Yisheng Xie <[email protected]>

---
 drivers/mmc/host/sdhci-xenon-phy.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

drivers/mmc/host/sdhci-xenon-phy.c +3 -8

index ec87943..a35804b 100644
@@ -814,15 +814,10 @@ static int xenon_add_phy(struct device_node *np, struct sdhci_host *host,
 {
 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
 	struct xenon_priv *priv = sdhci_pltfm_priv(pltfm_host);
-	int i, ret;
+	int ret;
 
-	for (i = 0; i < NR_PHY_TYPES; i++) {
-		if (!strcmp(phy_name, phy_types[i])) {
-			priv->phy_type = i;
-			break;
-		}
-	}
-	if (i == NR_PHY_TYPES) {
+	priv->phy_type = match_string(phy_types, NR_PHY_TYPES, phy_name);
+	if (priv->phy_type < 0) {
 		dev_err(mmc_dev(host->mmc),
 			"Unable to determine PHY name %s. Use default eMMC 5.1 PHY\n",
 			phy_name);

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Adrian Hunter <[email protected]>

Cc Hu Ziji <[email protected]>

Cc Ulf Hansson <[email protected]>

Cc [email protected]

Signed-off-by Yisheng Xie <[email protected]>

---
 drivers/mmc/host/sdhci-xenon-phy.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

drivers/mmc/host/sdhci-xenon-phy.c +3 -9

index ec87943..a35804b 100644
@@ -814,15 +814,10 @@ static int xenon_add_phy(struct device_node *np, struct sdhci_host *host,
 {
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
        struct xenon_priv *priv = sdhci_pltfm_priv(pltfm_host);
-       int i, ret;
+       int ret;
 
-       for (i = 0; i < NR_PHY_TYPES; i++) {
-               if (!strcmp(phy_name, phy_types[i])) {
-                       priv->phy_type = i;
-                       break;
-               }
-       }
-       if (i == NR_PHY_TYPES) {
+       priv->phy_type = match_string(phy_types, NR_PHY_TYPES, phy_name);
+       if (priv->phy_type < 0) {
                dev_err(mmc_dev(host->mmc),
                        "Unable to determine PHY name %s. Use default eMMC 5.1 PHY\n",
                        phy_name);
--

1.7.12.4

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Jason Cooper <[email protected]>

Cc Andrew Lunn <[email protected]>

Cc Gregory Clement <[email protected]>

Cc Sebastian Hesselbarth <[email protected]>

Cc Linus Walleij <[email protected]>

Cc linux-arm-kernel at lists.infradead.org

Cc linux-gpio at vger.kernel.org

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Sebastian Reichel <[email protected]>

Cc [email protected]

Signed-off-by Yisheng Xie <[email protected]>

---
 drivers/power/supply/power_supply_core.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

drivers/power/supply/power_supply_core.c +6 -11

index feac7b0..84da3a2 100644
@@ -36,8 +36,6 @@
 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
                                         struct power_supply *supply)
 {
-       int i;
-
        if (!supply->supplied_from && !supplier->supplied_to)
                return false;
 

@@ -45,18 +43,16 @@ static bool __power_supply_is_supplied_by(struct power_supply *supplier,
        if (supply->supplied_from) {
                if (!supplier->desc->name)
                        return false;
-               for (i = 0; i < supply->num_supplies; i++)
-                       if (!strcmp(supplier->desc->name, supply->supplied_from[i]))
-                               return true;
+               return match_string((const char **)supply->supplied_from,
+                                   supply->num_supplies,
+                                   supplier->desc->name) >= 0;
        } else {
                if (!supply->desc->name)
                        return false;
-               for (i = 0; i < supplier->num_supplicants; i++)
-                       if (!strcmp(supplier->supplied_to[i], supply->desc->name))
-                               return true;
+               return match_string((const char **)supplier->supplied_to,
+                                   supplier->num_supplicants,
+                                   supply->desc->name) >= 0;
        }
-
-       return false;
 }
 
 static int __power_supply_changed_work(struct device *dev, void *data)
--

1.7.12.4

Quoted 3 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

This doesn't make code looks better anyhow. I even think it makes it worse to read. That's why I dropped my version of the change (and yes, I missed the type conversion which looks here just ugly).

Sebastian, if my opinion makes any difference here, I would say NAK to this one.

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

+ i = match_string((const char **)trip_point->cdev_name,

Quoted 4 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

+ i = match_string((const char **)trip_point->cdev_name,

Casting looks ugly. You need to constify the variable itself.

drivers/thermal/db8500_thermal.c static int db8500_thermal_match_cdev(struct thermal_cooling_device *cdev, · line 56

Quoted 5 lines

drivers/thermal/db8500_thermal.c +2 -1

+                        COOLING_DEV_MAX, cdev->type);
 
-       return -ENODEV;
+       return (i < 0) ? -ENODEV : 0;

I would rather go with

if (ret < 0)
return -ENODEV;

return 0;

Hi Andy,

Quoted 7 lines · Andy Shevchenko

Quoted 4 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

+ i = match_string((const char **)trip_point->cdev_name,

Casting looks ugly. You need to constify the variable itself.

When I tried to const cdev_name like:
+++ b/include/linux/platform_data/db8500_thermal.h

(quoted diff) +1 -1

@@ -27,7 +27,7 @@
 struct db8500_trip_point {
        unsigned long temp;
        enum thermal_trip_type type;
-       char cdev_name[COOLING_DEV_MAX][THERMAL_NAME_LENGTH];
+       char const cdev_name[COOLING_DEV_MAX][THERMAL_NAME_LENGTH]; // const char cdev_name[COOLING_DEV_MAX][THERMAL_NAME_LENGTH] will also the same
 };
 

The compiler will also warning:
drivers/thermal/db8500_thermal.c: In function ‘db8500_thermal_match_cdev’:
drivers/thermal/db8500_thermal.c:53:2: warning: passing argument 1 of ‘match_string’ from incompatible pointer type [enabled by default]
i = match_string(trip_point->cdev_name, COOLING_DEV_MAX, cdev->type);
^
In file included from include/linux/bitmap.h:9:0,

                 from include/linux/cpumask.h:12,
                 from include/linux/rcupdate.h:44,
                 from include/linux/radix-tree.h:28,
                 from include/linux/idr.h:15,
                 from include/linux/kernfs.h:14,
                 from include/linux/sysfs.h:16,
                 from kernel/include/linux/kobject.h:20,
                 from kernel/include/linux/of.h:17,
                 from include/linux/cpu_cooling.h:27,
                 from drivers/thermal/db8500_thermal.c:20:

include/linux/string.h:184:5: note: expected ‘const char * const*’ but argument is of type ‘const char (*)[20]’

Any idea?

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc: Bartlomiej Zolnierkiewicz <[email protected]>
Cc: Arvind Yadav <[email protected]>
Cc: [email protected] [email protected]

        }

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Jani Nikula <[email protected]>

Cc Joonas Lahtinen <[email protected]>

Cc Rodrigo Vivi <[email protected]>

Cc David Airlie <[email protected]>

Cc [email protected]

Cc [email protected]

Quoted 2 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

https://patchwork.kernel.org/patch/10382323/

Quoted 7 lines

Cc Jani Nikula <[email protected]>

Cc Joonas Lahtinen <[email protected]>

Cc Rodrigo Vivi <[email protected]>

Cc David Airlie <[email protected]>

Cc [email protected]

Cc [email protected]

Quoted 5 lines · Andy Shevchenko

Quoted 2 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

https://patchwork.kernel.org/patch/10382323/

Even more convincingly,

47d4cb8ae8e7 ("i915: Convert to use match_string() helper")

BR,
Jani.

Quoted 7 lines

Quoted 7 lines

Cc Jani Nikula <[email protected]>

Cc Joonas Lahtinen <[email protected]>

Cc Rodrigo Vivi <[email protected]>

Cc David Airlie <[email protected]>

Cc [email protected]

Cc [email protected]

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Gustavo Padovan <[email protected]>

Cc Maarten Lankhorst <[email protected]>

Cc Sean Paul <[email protected]>

Cc David Airlie <[email protected]>

Cc [email protected]

Quoted 2 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

https://patchwork.kernel.org/patch/10382377/

Quoted 6 lines

Cc Gustavo Padovan <[email protected]>

Cc Maarten Lankhorst <[email protected]>

Cc Sean Paul <[email protected]>

Cc David Airlie <[email protected]>

Cc [email protected]

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Mimi Zohar <[email protected]>

Cc Dmitry Kasatkin <[email protected]>

Cc James Morris <[email protected]>

Cc "Serge E. Hallyn" <[email protected]>

Cc linux-integrity at vger.kernel.org

Cc linux-security-module at vger.kernel.org

Signed-off-by Yisheng Xie <[email protected]>

---
 security/integrity/ima/ima_main.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

security/integrity/ima/ima_main.c +0 -5

index 74d0bd7..f807093 100644
@@ -61,14 +61,11 @@ static int __init hash_setup(char *str)
 		goto out;
 	}
 
-	for (i = 0; i < HASH_ALGO__LAST; i++) {
-		if (strcmp(str, hash_algo_name[i]) == 0) {
-			ima_hash_algo = i;
-			break;
-		}

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc John Johansen <[email protected]>

Cc James Morris <[email protected]>

Cc "Serge E. Hallyn" <[email protected]>

Cc linux-security-module at vger.kernel.org

Signed-off-by Yisheng Xie <[email protected]>

---
 security/apparmor/lsm.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

security/apparmor/lsm.c +6 -13

index ce2b89e..9b5904f 100644
@@ -1378,14 +1378,12 @@ static int param_set_audit(const char *val, const struct kernel_param *kp)
 	if (apparmor_initialized && !policy_admin_capable(NULL))
 		return -EPERM;
 
-	for (i = 0; i < AUDIT_MAX_INDEX; i++) {
-		if (strcmp(val, audit_mode_names[i]) == 0) {
-			aa_g_audit = i;
-			return 0;
-		}
-	}
+	i = match_string(audit_mode_names, AUDIT_MAX_INDEX, val);
+	if (i < 0)
+		return -EINVAL;
 
-	return -EINVAL;
+	aa_g_audit = i;
+	return 0;
 }
 
 static int param_get_mode(char *buffer, const struct kernel_param *kp)

@@ -1409,14 +1407,13 @@ static int param_set_mode(const char *val, const struct kernel_param *kp)
 	if (apparmor_initialized && !policy_admin_capable(NULL))
 		return -EPERM;
 
-	for (i = 0; i < APPARMOR_MODE_NAMES_MAX_INDEX; i++) {
-		if (strcmp(val, aa_profile_mode_names[i]) == 0) {
-			aa_g_profile_mode = i;
-			return 0;
-		}
-	}
+	i = match_string(aa_profile_mode_names,

Quoted 3 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Andy Shevchenko patch to do the same thing is already in apparmor-next

Quoted 49 lines

Cc John Johansen <[email protected]>

Cc James Morris <[email protected]>

Cc "Serge E. Hallyn" <[email protected]>

Cc linux-security-module at vger.kernel.org

Signed-off-by Yisheng Xie <[email protected]>

---
 security/apparmor/lsm.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

security/apparmor/lsm.c +9 -13

index ce2b89e..9b5904f 100644
@@ -1378,14 +1378,12 @@ static int param_set_audit(const char *val, const struct kernel_param *kp)
 	if (apparmor_initialized && !policy_admin_capable(NULL))
 		return -EPERM;
 
-	for (i = 0; i < AUDIT_MAX_INDEX; i++) {
-		if (strcmp(val, audit_mode_names[i]) == 0) {
-			aa_g_audit = i;
-			return 0;
-		}
-	}
+	i = match_string(audit_mode_names, AUDIT_MAX_INDEX, val);
+	if (i < 0)
+		return -EINVAL;
 
-	return -EINVAL;
+	aa_g_audit = i;
+	return 0;
 }
 
 static int param_get_mode(char *buffer, const struct kernel_param *kp)

@@ -1409,14 +1407,13 @@ static int param_set_mode(const char *val, const struct kernel_param *kp)
 	if (apparmor_initialized && !policy_admin_capable(NULL))
 		return -EPERM;
 
-	for (i = 0; i < APPARMOR_MODE_NAMES_MAX_INDEX; i++) {
-		if (strcmp(val, aa_profile_mode_names[i]) == 0) {
-			aa_g_profile_mode = i;
-			return 0;
-		}
-	}
+	i = match_string(aa_profile_mode_names,
+			 APPARMOR_MODE_NAMES_MAX_INDEX, val);
+	if (i)
+		return -EINVAL;
 

security/apparmor/lsm.c static int param_set_mode(const char *val, const struct kernel_param *kp) · line 1419

Quoted 7 lines

security/apparmor/lsm.c +2 -1

-	return -EINVAL;
+	aa_g_profile_mode = i;
+	return 0;
 }
 
 /*

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc John Johansen <[email protected]>

Cc James Morris <[email protected]>

Cc "Serge E. Hallyn" <[email protected]>

Cc linux-security-module at vger.kernel.org

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Ingo Molnar <[email protected]>

Cc Peter Zijlstra <[email protected]>

Signed-off-by Yisheng Xie <[email protected]>

---
 kernel/sched/debug.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

kernel/sched/debug.c +0 -3

index 15b10e2..9e34499 100644
@@ -111,16 +111,14 @@ static int sched_feat_set(char *cmp)
                cmp += 3;
        }
 
-       for (i = 0; i < __SCHED_FEAT_NR; i++) {
-               if (strcmp(cmp, sched_feat_names[i]) == 0) {
-                       if (neg) {

kernel/sched/debug.c +6 -0

+               if (neg) {
+                       sysctl_sched_features &= ~(1UL << i);
+                       sched_feat_disable(i);
+               } else {
+                       sysctl_sched_features |= (1UL << i);
+                       sched_feat_enable(i);
                }
        }

Quoted 29 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Ingo Molnar <[email protected]>

Cc Peter Zijlstra <[email protected]>

Signed-off-by Yisheng Xie <[email protected]>

---
 kernel/sched/debug.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

kernel/sched/debug.c +1 -10

index 15b10e2..9e34499 100644
@@ -111,16 +111,14 @@ static int sched_feat_set(char *cmp)
                cmp += 3;
        }
 
-       for (i = 0; i < __SCHED_FEAT_NR; i++) {
-               if (strcmp(cmp, sched_feat_names[i]) == 0) {
-                       if (neg) {
-                               sysctl_sched_features &= ~(1UL << i);
-                               sched_feat_disable(i);
-                       } else {
-                               sysctl_sched_features |= (1UL << i);
-                               sched_feat_enable(i);
-                       }
-                       break;
+       i = match_string(sched_feat_names, __SCHED_FEAT_NR, cmp);

kernel/sched/debug.c static int sched_feat_set(char *cmp) · line 115

Quoted 1 line

kernel/sched/debug.c +1 -0

+       if (i >= 0) {

Why not

if (i < 0)
return i;

?

Quoted 13 lines

kernel/sched/debug.c +6 -0

+               if (neg) {
+                       sysctl_sched_features &= ~(1UL << i);
+                       sched_feat_disable(i);
+               } else {
+                       sysctl_sched_features |= (1UL << i);
+                       sched_feat_enable(i);
                }
        }
 

@@ -150,7 +148,7 @@ static int sched_feat_set(char *cmp)
        inode_lock(inode);
        i = sched_feat_set(cmp);
        inode_unlock(inode);

kernel/sched/debug.c static int sched_feat_set(char *cmp) · line 152

Quoted 3 lines

kernel/sched/debug.c +1 -1

-       if (i == __SCHED_FEAT_NR)
+       if (i < 0)
                return -EINVAL;

Now it would be

if (i < 0)
return i;

Quoted 7 lines

kernel/sched/debug.c static int sched_feat_set(char *cmp) · line 115

Quoted 2 lines

kernel/sched/debug.c +2 -0

+       i = match_string(sched_feat_names, __SCHED_FEAT_NR, cmp);
+       if (i >= 0) {

Why not

if (i < 0)
return i;

if i >=0 it will also return i. so need return i just if (i < 0), right ?

Quoted 8 lines

kernel/sched/debug.c static int sched_feat_set(char *cmp) · line 152

Quoted 3 lines

kernel/sched/debug.c +1 -1

-       if (i == __SCHED_FEAT_NR)
+       if (i < 0)
                return -EINVAL;

Now it would be

if (i < 0)

Quoted 1 line

return i;

Right, will change it in next version

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Clemens Ladisch <[email protected]>

Cc Jaroslav Kysela <[email protected]>

Cc Takashi Iwai <[email protected]>

Cc Takashi Sakamoto <[email protected]>

Cc [email protected]

Signed-off-by Yisheng Xie <[email protected]>

---
  sound/firewire/dice/dice.c | 8 +-------
  1 file changed, 1 insertion(+), 7 deletions(-)

sound/firewire/dice/dice.c +0 -1

index 96bb01b..0639074 100644
@@ -35,19 +35,13 @@ static bool force_two_pcm_support(struct fw_unit *unit)
  		"SAFFIRE_PRO_40_1",
  	};
  	char model[32];
-	unsigned int i;
  	int err;
 
  	err = fw_csr_string(unit->directory, CSR_MODEL, model, sizeof(model));
  	if (err < 0)
  		return false;
 

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Clemens Ladisch <[email protected]>

Cc Jaroslav Kysela <[email protected]>

Cc Takashi Iwai <[email protected]>

Cc [email protected]

Signed-off-by Yisheng Xie <[email protected]>

---
  sound/firewire/oxfw/oxfw.c | 8 +-------
  1 file changed, 1 insertion(+), 7 deletions(-)

sound/firewire/oxfw/oxfw.c +0 -1

index 413ab63..1e5b2c8 100644
@@ -49,7 +49,6 @@ static bool detect_loud_models(struct fw_unit *unit)
  		"Tapco LINK.firewire 4x6",
  		"U.420"};
  	char model[32];
-	unsigned int i;
  	int err;
 
  	err = fw_csr_string(unit->directory, CSR_MODEL,

@@ -57,12 +56,7 @@ static bool detect_loud_models(struct fw_unit *unit)
  	if (err < 0)
  		return false;
 

Hi,

Quoted 11 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Clemens Ladisch <[email protected]>

Cc Jaroslav Kysela <[email protected]>

Cc Takashi Iwai <[email protected]>

Cc [email protected]

Signed-off-by Yisheng Xie <[email protected]>

---
  sound/firewire/oxfw/oxfw.c | 8 +-------
  1 file changed, 1 insertion(+), 7 deletions(-)

Reviewed-by Takashi Sakamoto <[email protected]>

For my information, use_match_string() helper was firstly introduced to v4.6 kernel by a commit 56b060814e2d ('lib/string: introduce match_string() helper').

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

Cc Clemens Ladisch <[email protected]>

Cc Jaroslav Kysela <[email protected]>

Cc Takashi Iwai <[email protected]>

Cc [email protected]

Signed-off-by Yisheng Xie <[email protected]>

---
 sound/pci/oxygen/oxygen_mixer.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

sound/pci/oxygen/oxygen_mixer.c +0 -0

index 4ca1266..fbd8f5e 100644

sound/pci/oxygen/oxygen_mixer.c +5 -6

        for (i = 0; i < count; ++i) {
                template = controls[i];

@@ -1086,11 +1085,11 @@ static int add_controls(struct oxygen *chip,
                err = snd_ctl_add(chip->card, ctl);
                if (err < 0)
                        return err;
-               for (j = 0; j < CONTROL_COUNT; ++j)
-                       if (!strcmp(ctl->id.name, known_ctl_names[j])) {
-                               chip->controls[j] = ctl;
-                               ctl->private_free = oxygen_any_ctl_free;
-                       }
+               j = match_string(known_ctl_names, CONTROL_COUNT, ctl->id.name);
+               if (j >= 0) {
+                       chip->controls[j] = ctl;
+                       ctl->private_free = oxygen_any_ctl_free;
+               }
        }
        return 0;
 }
--

1.7.12.4

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

static int max98088_get_channel(struct snd_soc_component *component, const char *name) {

+ int ret = match_string(eq_mode_name, ARRAY_SIZE(eq_mode_name), name);

}

--
1.7.12.4

Quoted 7 lines · Yisheng Xie

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

static int max98088_get_channel(struct snd_soc_component *component, const char *name) {

+ int ret = match_string(eq_mode_name, ARRAY_SIZE(eq_mode_name), name);

I would rather split this and move an assignment to the line before 'if'

sound/soc/codecs/max98088.c static int max98088_set_bias_level(struct snd_soc_component *component,

Quoted 7 lines

        /* Shouldn't happen */

sound/soc/codecs/max98088.c +2 -0

+       if (ret < 0)
+               dev_err(component->dev, "Bad EQ channel name '%s'\n", name);
 
        return -EINVAL;

return ret;

?

Quoted 5 lines

}

--
1.7.12.4

hmm, you mean something like:

        int ret;

        ret = match_string(eq_mode_name, ARRAY_SIZE(eq_mode_name), name);
        if (ret < 0) /* Shouldn't happen */
                dev_err(component->dev, "Bad EQ channel name '%s'\n", name);
        return ret;

match_string() returns the index of an array for a matching string, which can be used intead of open coded variant.

+ int ret = match_string(bq_mode_name, ARRAY_SIZE(bq_mode_name), name);

        /* Shouldn't happen */

sound/soc/codecs/max98095.c +3 -0

+       if (ret < 0)
+               dev_err(component->dev, "Bad biquad channel name '%s'\n", name);
+       return ret;
 }

From f9e0b4afd4e9b19e95158962d81b5b776d57ca06 Mon Sep 17 00:00:00 2001