fixdep: use existing helper to check modular CONFIG options

str_ends_with() tests if the given token ends with a particular string.
Currently, it is used to check file paths without $(srctree).

Actually, we have one more place where this helper is useful.  Use it
to check if CONFIG option ends with _MODULE.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 0abc15778f56..fa3d39b6f23b 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -219,6 +219,17 @@ static void use_config(const char *m, int slen)
         print_config(m, slen);
 }
 
+/* test if s ends in sub */
+static int str_ends_with(const char *s, int slen, const char *sub)
+{
+        int sublen = strlen(sub);
+
+        if (sublen > slen)
+                return 0;
+
+        return !memcmp(s + slen - sublen, sub, sublen);
+}
+
 static void parse_config_file(const char *p)
 {
         const char *q, *r;
@@ -228,7 +239,7 @@ static void parse_config_file(const char *p)
                 q = p;
                 while (*q && (isalnum(*q) || *q == '_'))
                         q++;
-                if (memcmp(q - 7, "_MODULE", 7) == 0)
+                if (str_ends_with(p, q - p, "_MODULE"))
                         r = q - 7;
                 else
                         r = q;
@@ -238,17 +249,6 @@ static void parse_config_file(const char *p)
         }
 }
 
-/* test if s ends in sub */
-static int str_ends_with(const char *s, int slen, const char *sub)
-{
-        int sublen = strlen(sub);
-
-        if (sublen > slen)
-                return 0;
-
-        return !memcmp(s + slen - sublen, sub, sublen);
-}
-
 static void *read_file(const char *filename)
 {
         struct stat st;