Commit c5c468dc authored by Masahiro Yamada's avatar Masahiro Yamada

modpost: reuse ARRAY_SIZE() macro for section_mismatch()

Move ARRAY_SIZE() from file2alias.c to modpost.h to reuse it in
section_mismatch().

Also, move the variable 'check' inside the for-loop.
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
parent 76954527
...@@ -734,8 +734,6 @@ static int do_vio_entry(const char *filename, void *symval, ...@@ -734,8 +734,6 @@ static int do_vio_entry(const char *filename, void *symval,
return 1; return 1;
} }
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
static void do_input(char *alias, static void do_input(char *alias,
kernel_ulong_t *arr, unsigned int min, unsigned int max) kernel_ulong_t *arr, unsigned int min, unsigned int max)
{ {
......
...@@ -1049,8 +1049,6 @@ static const struct sectioncheck *section_mismatch( ...@@ -1049,8 +1049,6 @@ static const struct sectioncheck *section_mismatch(
const char *fromsec, const char *tosec) const char *fromsec, const char *tosec)
{ {
int i; int i;
int elems = sizeof(sectioncheck) / sizeof(struct sectioncheck);
const struct sectioncheck *check = &sectioncheck[0];
/* /*
* The target section could be the SHT_NUL section when we're * The target section could be the SHT_NUL section when we're
...@@ -1061,14 +1059,15 @@ static const struct sectioncheck *section_mismatch( ...@@ -1061,14 +1059,15 @@ static const struct sectioncheck *section_mismatch(
if (*tosec == '\0') if (*tosec == '\0')
return NULL; return NULL;
for (i = 0; i < elems; i++) { for (i = 0; i < ARRAY_SIZE(sectioncheck); i++) {
const struct sectioncheck *check = &sectioncheck[i];
if (match(fromsec, check->fromsec)) { if (match(fromsec, check->fromsec)) {
if (check->bad_tosec[0] && match(tosec, check->bad_tosec)) if (check->bad_tosec[0] && match(tosec, check->bad_tosec))
return check; return check;
if (check->good_tosec[0] && !match(tosec, check->good_tosec)) if (check->good_tosec[0] && !match(tosec, check->good_tosec))
return check; return check;
} }
check++;
} }
return NULL; return NULL;
} }
......
...@@ -97,6 +97,9 @@ static inline void __endian(const void *src, void *dest, unsigned int size) ...@@ -97,6 +97,9 @@ static inline void __endian(const void *src, void *dest, unsigned int size)
#endif #endif
#define NOFAIL(ptr) do_nofail((ptr), #ptr) #define NOFAIL(ptr) do_nofail((ptr), #ptr)
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
void *do_nofail(void *ptr, const char *expr); void *do_nofail(void *ptr, const char *expr);
struct buffer { struct buffer {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment