On 19/08/2025 14.12, Petr Pavlu wrote: > Remove the custom __modinit macro from kernel/params.c and instead use the > common __init_or_module macro from include/linux/module.h. Both provide the > same functionality. > > Signed-off-by: Petr Pavlu <[email protected]>
Reviewed-by: Daniel Gomez <[email protected]> > --- > kernel/params.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) > > diff --git a/kernel/params.c b/kernel/params.c > index b92d64161b75..19bb04f10372 100644 > --- a/kernel/params.c > +++ b/kernel/params.c > @@ -595,12 +595,6 @@ static ssize_t param_attr_store(const struct > module_attribute *mattr, > } > #endif > > -#ifdef CONFIG_MODULES > -#define __modinit > -#else > -#define __modinit __init > -#endif > - > #ifdef CONFIG_SYSFS > void kernel_param_lock(struct module *mod) > { > @@ -625,9 +619,9 @@ EXPORT_SYMBOL(kernel_param_unlock); > * create file in sysfs. Returns an error on out of memory. Always cleans > up > * if there's an error. > */ > -static __modinit int add_sysfs_param(struct module_kobject *mk, > - const struct kernel_param *kp, > - const char *name) > +static __init_or_module int add_sysfs_param(struct module_kobject *mk, > + const struct kernel_param *kp, > + const char *name) > { > struct module_param_attrs *new_mp; > struct attribute **new_attrs; > @@ -760,7 +754,8 @@ void destroy_params(const struct kernel_param *params, > unsigned num) > params[i].ops->free(params[i].arg); > } > > -struct module_kobject __modinit * lookup_or_create_module_kobject(const char > *name) > +struct module_kobject * __init_or_module > +lookup_or_create_module_kobject(const char *name) > { > struct module_kobject *mk; > struct kobject *kobj; > > base-commit: be48bcf004f9d0c9207ff21d0edb3b42f253829e
