ARM: 6338/1: module - simplify code with temporaries
authorPhil Carmody <ext-phil.2.carmody@nokia.com>
Thu, 19 Aug 2010 14:10:24 +0000 (15:10 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 2 Sep 2010 14:31:34 +0000 (15:31 +0100)
Less to read.

Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/module.c

index 6b46058..1dae046 100644 (file)
@@ -71,17 +71,19 @@ int module_frob_arch_sections(Elf_Ehdr *hdr,
        Elf_Shdr *s, *sechdrs_end = sechdrs + hdr->e_shnum;
 
        for (s = sechdrs; s < sechdrs_end; s++) {
-               if (strcmp(".ARM.exidx.init.text", secstrings + s->sh_name) == 0)
+               char const *secname = secstrings + s->sh_name;
+
+               if (strcmp(".ARM.exidx.init.text", secname) == 0)
                        mod->arch.unw_sec_init = s;
-               else if (strcmp(".ARM.exidx.devinit.text", secstrings + s->sh_name) == 0)
+               else if (strcmp(".ARM.exidx.devinit.text", secname) == 0)
                        mod->arch.unw_sec_devinit = s;
-               else if (strcmp(".ARM.exidx", secstrings + s->sh_name) == 0)
+               else if (strcmp(".ARM.exidx", secname) == 0)
                        mod->arch.unw_sec_core = s;
-               else if (strcmp(".init.text", secstrings + s->sh_name) == 0)
+               else if (strcmp(".init.text", secname) == 0)
                        mod->arch.sec_init_text = s;
-               else if (strcmp(".devinit.text", secstrings + s->sh_name) == 0)
+               else if (strcmp(".devinit.text", secname) == 0)
                        mod->arch.sec_devinit_text = s;
-               else if (strcmp(".text", secstrings + s->sh_name) == 0)
+               else if (strcmp(".text", secname) == 0)
                        mod->arch.sec_core_text = s;
        }
 #endif