Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

params: replace printk(KERN_<LVL>...) with pr_<lvl>(...)

I left 1 printk which uses __FILE__, __LINE__ explicitly, which should
not be subject to generic preferences expressed via pr_fmt().

+ tweaks suggested by Joe Perches:
- add doing to irq-enabled warning, like others. It wont happen often..
- change sysfs failure crit, not just err, make it 1 line in logs.
- coalese 2 format fragments into 1 >80 char line

cc: Joe Perches <joe@perches.com>
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jim Cromie and committed by
Greg Kroah-Hartman
b5f3abf9 04db6e5f

+12 -21
+12 -21
kernel/params.c
··· 201 201 irq_was_disabled = irqs_disabled(); 202 202 ret = parse_one(param, val, doing, params, num, 203 203 min_level, max_level, unknown); 204 - if (irq_was_disabled && !irqs_disabled()) { 205 - printk(KERN_WARNING "parse_args(): option '%s' enabled " 206 - "irq's!\n", param); 207 - } 204 + if (irq_was_disabled && !irqs_disabled()) 205 + pr_warn("%s: option '%s' enabled irq's!\n", 206 + doing, param); 207 + 208 208 switch (ret) { 209 209 case -ENOENT: 210 - printk(KERN_ERR "%s: Unknown parameter `%s'\n", 211 - doing, param); 210 + pr_err("%s: Unknown parameter `%s'\n", doing, param); 212 211 return ret; 213 212 case -ENOSPC: 214 - printk(KERN_ERR 215 - "%s: `%s' too large for parameter `%s'\n", 213 + pr_err("%s: `%s' too large for parameter `%s'\n", 216 214 doing, val ?: "", param); 217 215 return ret; 218 216 case 0: 219 217 break; 220 218 default: 221 - printk(KERN_ERR 222 - "%s: `%s' invalid for parameter `%s'\n", 219 + pr_err("%s: `%s' invalid for parameter `%s'\n", 223 220 doing, val ?: "", param); 224 221 return ret; 225 222 } ··· 263 266 int param_set_charp(const char *val, const struct kernel_param *kp) 264 267 { 265 268 if (strlen(val) > 1024) { 266 - printk(KERN_ERR "%s: string parameter too long\n", 267 - kp->name); 269 + pr_err("%s: string parameter too long\n", kp->name); 268 270 return -ENOSPC; 269 271 } 270 272 ··· 399 403 int len; 400 404 401 405 if (*num == max) { 402 - printk(KERN_ERR "%s: can only take %i arguments\n", 403 - name, max); 406 + pr_err("%s: can only take %i arguments\n", name, max); 404 407 return -EINVAL; 405 408 } 406 409 len = strcspn(val, ","); ··· 418 423 } while (save == ','); 419 424 420 425 if (*num < min) { 421 - printk(KERN_ERR "%s: needs at least %i arguments\n", 422 - name, min); 426 + pr_err("%s: needs at least %i arguments\n", name, min); 423 427 return -EINVAL; 424 428 } 425 429 return 0; ··· 477 483 const struct kparam_string *kps = kp->str; 478 484 479 485 if (strlen(val)+1 > kps->maxlen) { 480 - printk(KERN_ERR "%s: string doesn't fit in %u chars.\n", 486 + pr_err("%s: string doesn't fit in %u chars.\n", 481 487 kp->name, kps->maxlen-1); 482 488 return -ENOSPC; 483 489 } ··· 747 753 #endif 748 754 if (err) { 749 755 kobject_put(&mk->kobj); 750 - printk(KERN_ERR 751 - "Module '%s' failed add to sysfs, error number %d\n", 756 + pr_crit("Adding module '%s' to sysfs failed (%d), the system may be unstable.\n", 752 757 name, err); 753 - printk(KERN_ERR 754 - "The system will be unstable now.\n"); 755 758 return NULL; 756 759 } 757 760