Commit 184b8f7f authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'printk-for-5.5-pr-warning-removal' of...

Merge tag 'printk-for-5.5-pr-warning-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk

Pull pr_warning() removal from Petr Mladek.

 - Final removal of the unused pr_warning() alias.

You're supposed to use just "pr_warn()" in the kernel.

* tag 'printk-for-5.5-pr-warning-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
  checkpatch: Drop pr_warning check
  printk: Drop pr_warning definition
  Fix up for "printk: Drop pr_warning definition"
  workqueue: Use pr_warn instead of pr_warning
parents 316eaf17 969bea5e
...@@ -302,9 +302,8 @@ extern int kptr_restrict; ...@@ -302,9 +302,8 @@ extern int kptr_restrict;
printk(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__) printk(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__)
#define pr_err(fmt, ...) \ #define pr_err(fmt, ...) \
printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
#define pr_warning(fmt, ...) \ #define pr_warn(fmt, ...) \
printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
#define pr_warn pr_warning
#define pr_notice(fmt, ...) \ #define pr_notice(fmt, ...) \
printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
#define pr_info(fmt, ...) \ #define pr_info(fmt, ...) \
......
...@@ -5070,7 +5070,7 @@ static __init int test_ringbuffer(void) ...@@ -5070,7 +5070,7 @@ static __init int test_ringbuffer(void)
int ret = 0; int ret = 0;
if (security_locked_down(LOCKDOWN_TRACEFS)) { if (security_locked_down(LOCKDOWN_TRACEFS)) {
pr_warning("Lockdown is enabled, skipping ring buffer tests\n"); pr_warn("Lockdown is enabled, skipping ring buffer tests\n");
return 0; return 0;
} }
......
...@@ -1889,7 +1889,7 @@ int __init register_tracer(struct tracer *type) ...@@ -1889,7 +1889,7 @@ int __init register_tracer(struct tracer *type)
} }
if (security_locked_down(LOCKDOWN_TRACEFS)) { if (security_locked_down(LOCKDOWN_TRACEFS)) {
pr_warning("Can not register tracer %s due to lockdown\n", pr_warn("Can not register tracer %s due to lockdown\n",
type->name); type->name);
return -EPERM; return -EPERM;
} }
...@@ -8796,7 +8796,7 @@ struct dentry *tracing_init_dentry(void) ...@@ -8796,7 +8796,7 @@ struct dentry *tracing_init_dentry(void)
struct trace_array *tr = &global_trace; struct trace_array *tr = &global_trace;
if (security_locked_down(LOCKDOWN_TRACEFS)) { if (security_locked_down(LOCKDOWN_TRACEFS)) {
pr_warning("Tracing disabled due to lockdown\n"); pr_warn("Tracing disabled due to lockdown\n");
return ERR_PTR(-EPERM); return ERR_PTR(-EPERM);
} }
...@@ -9244,7 +9244,7 @@ __init static int tracer_alloc_buffers(void) ...@@ -9244,7 +9244,7 @@ __init static int tracer_alloc_buffers(void)
if (security_locked_down(LOCKDOWN_TRACEFS)) { if (security_locked_down(LOCKDOWN_TRACEFS)) {
pr_warning("Tracing disabled due to lockdown\n"); pr_warn("Tracing disabled due to lockdown\n");
return -EPERM; return -EPERM;
} }
......
...@@ -4374,8 +4374,8 @@ void destroy_workqueue(struct workqueue_struct *wq) ...@@ -4374,8 +4374,8 @@ void destroy_workqueue(struct workqueue_struct *wq)
for_each_pwq(pwq, wq) { for_each_pwq(pwq, wq) {
spin_lock_irq(&pwq->pool->lock); spin_lock_irq(&pwq->pool->lock);
if (WARN_ON(pwq_busy(pwq))) { if (WARN_ON(pwq_busy(pwq))) {
pr_warning("%s: %s has the following busy pwq\n", pr_warn("%s: %s has the following busy pwq\n",
__func__, wq->name); __func__, wq->name);
show_pwq(pwq); show_pwq(pwq);
spin_unlock_irq(&pwq->pool->lock); spin_unlock_irq(&pwq->pool->lock);
mutex_unlock(&wq->mutex); mutex_unlock(&wq->mutex);
......
...@@ -4125,15 +4125,6 @@ sub process { ...@@ -4125,15 +4125,6 @@ sub process {
"Prefer [subsystem eg: netdev]_$level2([subsystem]dev, ... then dev_$level2(dev, ... then pr_$level(... to printk(KERN_$orig ...\n" . $herecurr); "Prefer [subsystem eg: netdev]_$level2([subsystem]dev, ... then dev_$level2(dev, ... then pr_$level(... to printk(KERN_$orig ...\n" . $herecurr);
} }
if ($line =~ /\bpr_warning\s*\(/) {
if (WARN("PREFER_PR_LEVEL",
"Prefer pr_warn(... to pr_warning(...\n" . $herecurr) &&
$fix) {
$fixed[$fixlinenr] =~
s/\bpr_warning\b/pr_warn/;
}
}
if ($line =~ /\bdev_printk\s*\(\s*KERN_([A-Z]+)/) { if ($line =~ /\bdev_printk\s*\(\s*KERN_([A-Z]+)/) {
my $orig = $1; my $orig = $1;
my $level = lc($orig); my $level = lc($orig);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment