| Message ID | 1542860922-9730-2-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | f880eea68fe593342fa6e09be9bb661f3c297aec |
| Headers | show |
| Series | [1/2] modpost: file2alias: go back to simple devtable lookup | expand |
On Thu, Nov 22, 2018 at 5:29 AM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > Use specific prototype instead of an opaque pointer so that the > compiler can catch incompatible pointer type. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > scripts/mod/file2alias.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c > index 7e4aede..a37af7d 100644 > --- a/scripts/mod/file2alias.c > +++ b/scripts/mod/file2alias.c > @@ -47,7 +47,7 @@ typedef struct { > struct devtable { > const char *device_id; /* name of table, __mod_<name>__*_device_table. */ > unsigned long id_size; > - void *function; > + int (*do_entry)(const char *filename, void *symval, char *alias); > }; It makes sense to do this cleanup. Reviewed-by: Mathieu Malaterre <malat@debian.org> > /* Define a variable f that holds the value of field f of struct devid > @@ -1299,12 +1299,11 @@ static bool sym_is(const char *name, unsigned namelen, const char *symbol) > static void do_table(void *symval, unsigned long size, > unsigned long id_size, > const char *device_id, > - void *function, > + int (*do_entry)(const char *filename, void *symval, char *alias), > struct module *mod) > { > unsigned int i; > char alias[500]; > - int (*do_entry)(const char *, void *entry, char *alias) = function; > > device_id_check(mod->name, device_id, size, id_size, symval); > /* Leave last one: it's the terminator. */ > @@ -1420,7 +1419,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, > > if (sym_is(name, namelen, p->device_id)) { > do_table(symval, sym->st_size, p->id_size, > - p->device_id, p->function, mod); > + p->device_id, p->do_entry, mod); > break; > } > } > -- > 2.7.4 >
On Fri, Nov 23, 2018 at 1:51 AM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > Use specific prototype instead of an opaque pointer so that the > compiler can catch incompatible pointer type. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- Applied to linux-kbuild. > scripts/mod/file2alias.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c > index 7e4aede..a37af7d 100644 > --- a/scripts/mod/file2alias.c > +++ b/scripts/mod/file2alias.c > @@ -47,7 +47,7 @@ typedef struct { > struct devtable { > const char *device_id; /* name of table, __mod_<name>__*_device_table. */ > unsigned long id_size; > - void *function; > + int (*do_entry)(const char *filename, void *symval, char *alias); > }; > > /* Define a variable f that holds the value of field f of struct devid > @@ -1299,12 +1299,11 @@ static bool sym_is(const char *name, unsigned namelen, const char *symbol) > static void do_table(void *symval, unsigned long size, > unsigned long id_size, > const char *device_id, > - void *function, > + int (*do_entry)(const char *filename, void *symval, char *alias), > struct module *mod) > { > unsigned int i; > char alias[500]; > - int (*do_entry)(const char *, void *entry, char *alias) = function; > > device_id_check(mod->name, device_id, size, id_size, symval); > /* Leave last one: it's the terminator. */ > @@ -1420,7 +1419,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, > > if (sym_is(name, namelen, p->device_id)) { > do_table(symval, sym->st_size, p->id_size, > - p->device_id, p->function, mod); > + p->device_id, p->do_entry, mod); > break; > } > } > -- > 2.7.4 > -- Best Regards Masahiro Yamada
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 7e4aede..a37af7d 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -47,7 +47,7 @@ typedef struct { struct devtable { const char *device_id; /* name of table, __mod_<name>__*_device_table. */ unsigned long id_size; - void *function; + int (*do_entry)(const char *filename, void *symval, char *alias); }; /* Define a variable f that holds the value of field f of struct devid @@ -1299,12 +1299,11 @@ static bool sym_is(const char *name, unsigned namelen, const char *symbol) static void do_table(void *symval, unsigned long size, unsigned long id_size, const char *device_id, - void *function, + int (*do_entry)(const char *filename, void *symval, char *alias), struct module *mod) { unsigned int i; char alias[500]; - int (*do_entry)(const char *, void *entry, char *alias) = function; device_id_check(mod->name, device_id, size, id_size, symval); /* Leave last one: it's the terminator. */ @@ -1420,7 +1419,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, if (sym_is(name, namelen, p->device_id)) { do_table(symval, sym->st_size, p->id_size, - p->device_id, p->function, mod); + p->device_id, p->do_entry, mod); break; } }
Use specific prototype instead of an opaque pointer so that the compiler can catch incompatible pointer type. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- scripts/mod/file2alias.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.7.4