Messages in this thread | | | Date | Tue, 14 Jul 2015 15:05:15 +0800 | From | Minfei Huang <> | Subject | Re: [PATCH 2/2] Define kallsyms_cmp_symbol_t as function type to simplify the code |
| |
Lost the character 'n' in the Namhyung Kim <namhyung@kernel.org>. Resent it.
On 07/14/15 at 02:59P, Minfei Huang wrote: > From: Minfei Huang <mnfhuang@gmail.com> > > It is not elegance, if we use function directly as the argument, like > following: > > int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, > struct module *, unsigned long), > void *data); > > Here introduce a type defined function kallsyms_cmp_symbol_t. Now > we can use these type defined function directly, if we want to pass > the function as the argument. > > int module_kallsyms_on_each_symbol(kallsyms_cmp_symbol_t fn, > void *data); > > Signed-off-by: Minfei Huang <mnfhuang@gmail.com> > --- > include/linux/kallsyms.h | 10 +++------- > include/linux/module.h | 13 ++++++------- > kernel/kallsyms.c | 4 +--- > kernel/module.c | 4 +--- > 4 files changed, 11 insertions(+), 20 deletions(-) > > diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h > index 6883e19..e8ed37d 100644 > --- a/include/linux/kallsyms.h > +++ b/include/linux/kallsyms.h > @@ -8,6 +8,7 @@ > #include <linux/errno.h> > #include <linux/kernel.h> > #include <linux/stddef.h> > +#include <linux/module.h> > > #define KSYM_NAME_LEN 128 > #define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s]") + (KSYM_NAME_LEN - 1) + \ > @@ -20,9 +21,7 @@ struct module; > unsigned long kallsyms_lookup_name(const char *name); > > /* Call a function on each kallsyms symbol in the core kernel */ > -int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *, > - unsigned long), > - void *data); > +int kallsyms_on_each_symbol(kallsyms_cmp_symbol_t fn, void *data); > > extern int kallsyms_lookup_size_offset(unsigned long addr, > unsigned long *symbolsize, > @@ -52,10 +51,7 @@ static inline unsigned long kallsyms_lookup_name(const char *name) > return 0; > } > > -static inline int kallsyms_on_each_symbol(int (*fn)(void *, const char *, > - struct module *, > - unsigned long), > - void *data) > +static inline int kallsyms_on_each_symbol(kallsyms_cmp_symbol_t fn, void *data) > { > return 0; > } > diff --git a/include/linux/module.h b/include/linux/module.h > index 1e125b1..6a05a24 100644 > --- a/include/linux/module.h > +++ b/include/linux/module.h > @@ -479,9 +479,10 @@ int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type, > /* Look for this name: can be of form module:name. */ > unsigned long module_kallsyms_lookup_name(const char *name); > > -int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, > - struct module *, unsigned long), > - void *data); > +typedef int (*kallsyms_cmp_symbol_t)(void *, const char *, > + struct module *, unsigned long); > + > +int module_kallsyms_on_each_symbol(kallsyms_cmp_symbol_t fn, void *data); > > extern void __module_put_and_exit(struct module *mod, long code) > __attribute__((noreturn)); > @@ -637,10 +638,8 @@ static inline unsigned long module_kallsyms_lookup_name(const char *name) > return 0; > } > > -static inline int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, > - struct module *, > - unsigned long), > - void *data) > +static inline int module_kallsyms_on_each_symbol( > + kallsyms_cmp_symbol_t fn, void *data) > { > return 0; > } > diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c > index 5c5987f..be5786b 100644 > --- a/kernel/kallsyms.c > +++ b/kernel/kallsyms.c > @@ -193,9 +193,7 @@ unsigned long kallsyms_lookup_name(const char *name) > } > EXPORT_SYMBOL_GPL(kallsyms_lookup_name); > > -int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *, > - unsigned long), > - void *data) > +int kallsyms_on_each_symbol(kallsyms_cmp_symbol_t fn, void *data) > { > char namebuf[KSYM_NAME_LEN]; > unsigned long i; > diff --git a/kernel/module.c b/kernel/module.c > index 1400c0b..67ed39b 100644 > --- a/kernel/module.c > +++ b/kernel/module.c > @@ -3811,9 +3811,7 @@ unsigned long module_kallsyms_lookup_name(const char *name) > return ret; > } > > -int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, > - struct module *, unsigned long), > - void *data) > +int module_kallsyms_on_each_symbol(kallsyms_cmp_symbol_t fn, void *data) > { > struct module *mod; > unsigned int i; > -- > 2.2.2 >
| |