modpost: squash if...else-if in find_elf_symbol2()

if ((addr - sym->st_value) < distance) {
            distance = addr - sym->st_value;
            near = sym;
    } else if ((addr - sym->st_value) == distance) {
            near = sym;
    }

is equivalent to:

    if (addr - sym->st_value <= distance) {
            distance = addr - sym->st_value;
            near = sym;
    }

(The else-if block can overwrite 'distance' with the same value).

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index fc8ba8585d23c62554b0e5591bd290ed60904728..b70a31b4245a9b87f177933a1bca3bdaf448de85 100644 (file)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1270,13 +1270,9 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr,
                        continue;
                if (!is_valid_name(elf, sym))
                        continue;
-               if (sym->st_value <= addr) {
-                       if ((addr - sym->st_value) < distance) {
-                               distance = addr - sym->st_value;
-                               near = sym;
-                       } else if ((addr - sym->st_value) == distance) {
-                               near = sym;
-                       }
+               if (sym->st_value <= addr && addr - sym->st_value <= distance) {
+                       distance = addr - sym->st_value;
+                       near = sym;
                }
        }
        return near;