Merge tag 'platform-drivers-x86-v4.16-4' of git://git.infradead.org/linux-platform...

[sfrench/cifs-2.6.git] / include / linux / moduleparam.h

diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index 1d7140fef154c8bd68b4c3a55f0f7dfa02136d8a..ba36506db4fb71f4b4297f81c1bcb893d30b8145 100644 (file)
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -228,19 +228,11 @@ struct kparam_array
            VERIFY_OCTAL_PERMISSIONS(perm), level, flags, { arg } }
 
 /* Obsolete - use module_param_cb() */
-#define module_param_call(name, set, get, arg, perm)                   \
-       static const struct kernel_param_ops __param_ops_##name =               \
-               { .flags = 0, (void *)set, (void *)get };               \
+#define module_param_call(name, _set, _get, arg, perm)                 \
+       static const struct kernel_param_ops __param_ops_##name =       \
+               { .flags = 0, .set = _set, .get = _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);