Per-device parameter support (5/16)
dp_05_module_param_ranged.diff
This is the 5th patch of 16 patches for devparam.
This patch removes the const qualifier from @val of param_array().param_array() does modify @val and I think it's clearer this way.
Signed-off-by Tejun Heo <[email protected]>
include/linux/moduleparam.h +1 -1
@@ -179,7 +179,7 @@ extern int param_get_string(char *bufferextern int param_set_flag (const char *val,struct kernel_param *kp);extern int param_get_flag (char *buffer,struct kernel_param *kp); -int param_array(const char *name, const char *val, +int param_array(const char *name, char *val, long min_val, long max_val, unsigned int min, unsigned int max, void *elem, int elemsize, int (*set)(const char *, struct kernel_param *kp),
kernel/module.c +7 -6
@@ -729,6 +729,7 @@ int set_obsolete(const char *val, structint dummy;char *endp;const char *p; +char *v = (char *)val;struct obsolete_modparm *obsparm = kp->arg;if (!val) {
@@ -748,19 +749,19 @@ int set_obsolete(const char *val, struct max = min;switch (*endp) {case 'b' : -return param_array (kp->name, val,1 ,0 , min, max, obsparm->addr, +return param_array (kp->name, v,1 ,0 , min, max, obsparm->addr,1 , param_set_byte, &dummy);case 'h' : -return param_array (kp->name, val,1 ,0 , min, max, obsparm->addr, +return param_array (kp->name, v,1 ,0 , min, max, obsparm->addr,sizeof (short ), param_set_short, &dummy);case 'i' : -return param_array (kp->name, val,1 ,0 , min, max, obsparm->addr, +return param_array (kp->name, v,1 ,0 , min, max, obsparm->addr,sizeof (int ), param_set_int, &dummy);case 'l' : -return param_array (kp->name, val,1 ,0 , min, max, obsparm->addr, +return param_array (kp->name, v,1 ,0 , min, max, obsparm->addr,sizeof (long ), param_set_long, &dummy);case 's' : -return param_array (kp->name, val,1 ,0 , min, max, obsparm->addr, +return param_array (kp->name, v,1 ,0 , min, max, obsparm->addr,sizeof (char *), param_set_charp, &dummy);case 'c' :
@@ -777,7 +778,7 @@ int set_obsolete(const char *val, struct }if (size >= maxsize) goto oversize; -return param_array (kp->name, val,1 ,0 , min, max, obsparm->addr, +return param_array (kp->name, v,1 ,0 , min, max, obsparm->addr, maxsize, obsparm_copy_string, &dummy); }printk (KERN_ERR "Unknown obsolete parameter type %s\n" , obsparm->type);
kernel/params.c +3 -3
@@ -265,7 +265,7 @@ int param_get_invbool(char *buffer, stru }/* We cheat here and temporarily mangle the string. */ -int param_array(const char *name, const char *val, +int param_array(const char *name, char *val, long min_val, long max_val, unsigned int min, unsigned int max, void *elem, int elemsize, int (*set)(const char *, struct kernel_param *kp),
@@ -301,7 +301,7 @@ int param_array(const char *name, const/* nul-terminate and parse */ save = val[len]; - ((char *)val)[len] ='\0' ; + val[len] ='\0' ; ret =set (val, &kp);if (ret !=0 )
@@ -324,7 +324,7 @@ int param_array_set(const char *val, strstruct kparam_array *arr = kp->arg;unsigned int t; -return param_array (kp->name, val, kp->min, kp->max, +return param_array (kp->name, (char *)val, kp->min, kp->max,1 , arr->max, arr->elem, arr->elemsize, arr->set, arr->num ?: &t); }