From: Kees Cook Date: Wed, 18 Oct 2017 02:04:41 +0000 (-0700) Subject: UPSTREAM: module: Prepare to convert all module_param_call() prototypes X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5b37dfe508f9d710946524faa1bcfab228e8c100;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git UPSTREAM: module: Prepare to convert all module_param_call() prototypes After actually converting all module_param_call() function prototypes, we no longer need to do a tricky sizeof(func(thing)) type-check. Remove it. Signed-off-by: Kees Cook Signed-off-by: Jessica Yu Bug: 67506682 Change-Id: Ie20dbd09634c7cbef499c81bf2dbfd762ad0058a (cherry picked from commit b2f270e8747387335d80428c576118e7d87f69cc) Signed-off-by: Sami Tolvanen --- diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index 1d7140fef154..d94e5bef4a12 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -229,18 +229,10 @@ struct kparam_array /* Obsolete - use module_param_cb() */ #define module_param_call(name, set, get, arg, perm) \ - static const struct kernel_param_ops __param_ops_##name = \ + static const struct kernel_param_ops __param_ops_##name = \ { .flags = 0, (void *)set, (void *)get }; \ __module_param_call(MODULE_PARAM_PREFIX, \ - name, &__param_ops_##name, arg, \ - (perm) + sizeof(__check_old_set_param(set))*0, -1, 0) - -/* We don't get oldget: it's often a new-style param_get_uint, etc. */ -static inline int -__check_old_set_param(int (*oldset)(const char *, struct kernel_param *)) -{ - return 0; -} + name, &__param_ops_##name, arg, perm, -1, 0) #ifdef CONFIG_SYSFS extern void kernel_param_lock(struct module *mod);