[PATCH v6 18/19] treewide: s/\<strends\>/strsuffix/g

[Alejandro Colomar]

Except for the changes to "lib/tests/string_kunit.c", this was
a scripted change:

	$ git ls-files \
	| grep '\.[ch]$' \
	| grep -v -e ^tools/ -e ^scripts/ -e ^include/ \
	| xargs grep -l strends \
	| xargs sed -i 's/strends/strsuffix/g';

Signed-off-by: Alejandro Colomar <alx@xxxxxxxxxx>
---
 drivers/gpio/gpiolib-shared.c |  8 ++++----
 drivers/of/property.c         |  4 ++--
 lib/tests/string_kunit.c      | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/gpio/gpiolib-shared.c b/drivers/gpio/gpiolib-shared.c
index 8c9ac9d93304..677ec27e4e34 100644
--- a/drivers/gpio/gpiolib-shared.c
+++ b/drivers/gpio/gpiolib-shared.c
@@ -182,8 +182,8 @@ static int gpio_shared_of_traverse(struct device_node *curr)
 		 * them. We can always just export the quirk list and
 		 * iterate over it here.
 		 */
-		if (!strends(prop->name, "-gpios") &&
-		    !strends(prop->name, "-gpio") &&
+		if (!strsuffix(prop->name, "-gpios") &&
+		    !strsuffix(prop->name, "-gpio") &&
 		    strcmp(prop->name, "gpios") != 0 &&
 		    strcmp(prop->name, "gpio") != 0)
 			continue;
@@ -240,9 +240,9 @@ static int gpio_shared_of_traverse(struct device_node *curr)
 				list_add_tail(&entry->list, &gpio_shared_list);
 			}
 
-			if (strends(prop->name, "gpios"))
+			if (strsuffix(prop->name, "gpios"))
 				suffix = "-gpios";
-			else if (strends(prop->name, "gpio"))
+			else if (strsuffix(prop->name, "gpio"))
 				suffix = "-gpio";
 			else
 				suffix = NULL;
diff --git a/drivers/of/property.c b/drivers/of/property.c
index f0729619a2a0..3a272775a8b7 100644
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -1344,7 +1344,7 @@ static struct device_node *parse_suffix_prop_cells(struct device_node *np,
 {
 	struct of_phandle_args sup_args;
 
-	if (!strends(prop_name, suffix))
+	if (!strsuffix(prop_name, suffix))
 		return NULL;
 
 	if (of_parse_phandle_with_args(np, prop_name, cells_name, index,
@@ -1433,7 +1433,7 @@ static struct device_node *parse_pinctrl_n(struct device_node *np,
 static struct device_node *parse_gpios(struct device_node *np,
 				       const char *prop_name, int index)
 {
-	if (strends(prop_name, ",nr-gpios"))
+	if (strsuffix(prop_name, ",nr-gpios"))
 		return NULL;
 
 	return parse_suffix_prop_cells(np, prop_name, index, "-gpios",
diff --git a/lib/tests/string_kunit.c b/lib/tests/string_kunit.c
index f603e89866d1..f07a9480cfb1 100644
--- a/lib/tests/string_kunit.c
+++ b/lib/tests/string_kunit.c
@@ -712,16 +712,16 @@ static void string_test_memtostr(struct kunit *test)
 	KUNIT_EXPECT_EQ(test, dest[7], '\0');
 }
 
-static void string_test_strends(struct kunit *test)
+static void string_test_strsuffix(struct kunit *test)
 {
-	KUNIT_EXPECT_TRUE(test, strends("foo-bar", "bar"));
-	KUNIT_EXPECT_TRUE(test, strends("foo-bar", "-bar"));
-	KUNIT_EXPECT_TRUE(test, strends("foobar", "foobar"));
-	KUNIT_EXPECT_TRUE(test, strends("foobar", ""));
-	KUNIT_EXPECT_FALSE(test, strends("bar", "foobar"));
-	KUNIT_EXPECT_FALSE(test, strends("", "foo"));
-	KUNIT_EXPECT_FALSE(test, strends("foobar", "ba"));
-	KUNIT_EXPECT_TRUE(test, strends("", ""));
+	KUNIT_EXPECT_TRUE(test, streq(strsuffix("foo-bar", "bar"), "bar"));
+	KUNIT_EXPECT_TRUE(test, streq(strsuffix("foo-bar", "-bar"), "-bar"));
+	KUNIT_EXPECT_TRUE(test, streq(strsuffix("foobar", "foobar"), "foobar"));
+	KUNIT_EXPECT_TRUE(test, streq(strsuffix("foobar", ""), ""));
+	KUNIT_EXPECT_NULL(test, strsuffix("bar", "foobar"));
+	KUNIT_EXPECT_NULL(test, strsuffix("", "foo"));
+	KUNIT_EXPECT_NULL(test, strsuffix("foobar", "ba"));
+	KUNIT_EXPECT_TRUE(test, streq(strsuffix("", ""), ""));
 }
 
 #if IS_ENABLED(CONFIG_STRING_KUNIT_BENCH)
@@ -914,7 +914,7 @@ static struct kunit_case string_test_cases[] = {
 	KUNIT_CASE(string_test_strlcat),
 	KUNIT_CASE(string_test_strtomem),
 	KUNIT_CASE(string_test_memtostr),
-	KUNIT_CASE(string_test_strends),
+	KUNIT_CASE(string_test_strsuffix),
 	KUNIT_CASE(string_bench_strlen),
 	KUNIT_CASE(string_bench_strnlen),
 	KUNIT_CASE(string_bench_strchr),
-- 
2.55.0

Attachment: signature.asc
Description: PGP signature