treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively
%pF and %pf are functionally equivalent to %pS and %ps conversion specifiers. The former are deprecated, therefore switch the current users to use the preferred variant. The changes have been produced by the following command: git grep -l '%p[fF]' | grep -v '^\(tools\|Documentation\)/' | \ while read i; do perl -i -pe 's/%pf/%ps/g; s/%pF/%pS/g;' $i; done And verifying the result. Link: http://lkml.kernel.org/r/20190325193229.23390-1-sakari.ailus@linux.intel.com Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: linux-arm-kernel@lists.infradead.org Cc: sparclinux@vger.kernel.org Cc: linux-um@lists.infradead.org Cc: xen-devel@lists.xenproject.org Cc: linux-acpi@vger.kernel.org Cc: linux-pm@vger.kernel.org Cc: drbd-dev@lists.linbit.com Cc: linux-block@vger.kernel.org Cc: linux-mmc@vger.kernel.org Cc: linux-nvdimm@lists.01.org Cc: linux-pci@vger.kernel.org Cc: linux-scsi@vger.kernel.org Cc: linux-btrfs@vger.kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net Cc: linux-mm@kvack.org Cc: ceph-devel@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Acked-by: David Sterba <dsterba@suse.com> (for btrfs) Acked-by: Mike Rapoport <rppt@linux.ibm.com> (for mm/memblock.c) Acked-by: Bjorn Helgaas <bhelgaas@google.com> (for drivers/pci) Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Petr Mladek <pmladek@suse.com>
This commit is contained in:

committed by
Petr Mladek

parent
c4703acd6d
commit
d75f773c86
@@ -119,7 +119,7 @@ static void async_run_entry_fn(struct work_struct *work)
|
||||
|
||||
/* 1) run (and print duration) */
|
||||
if (initcall_debug && system_state < SYSTEM_RUNNING) {
|
||||
pr_debug("calling %lli_%pF @ %i\n",
|
||||
pr_debug("calling %lli_%pS @ %i\n",
|
||||
(long long)entry->cookie,
|
||||
entry->func, task_pid_nr(current));
|
||||
calltime = ktime_get();
|
||||
@@ -128,7 +128,7 @@ static void async_run_entry_fn(struct work_struct *work)
|
||||
if (initcall_debug && system_state < SYSTEM_RUNNING) {
|
||||
rettime = ktime_get();
|
||||
delta = ktime_sub(rettime, calltime);
|
||||
pr_debug("initcall %lli_%pF returned 0 after %lld usecs\n",
|
||||
pr_debug("initcall %lli_%pS returned 0 after %lld usecs\n",
|
||||
(long long)entry->cookie,
|
||||
entry->func,
|
||||
(long long)ktime_to_ns(delta) >> 10);
|
||||
|
@@ -2028,7 +2028,7 @@ static void handler_chain(struct uprobe *uprobe, struct pt_regs *regs)
|
||||
if (uc->handler) {
|
||||
rc = uc->handler(uc, regs);
|
||||
WARN(rc & ~UPROBE_HANDLER_MASK,
|
||||
"bad rc=0x%x from %pf()\n", rc, uc->handler);
|
||||
"bad rc=0x%x from %ps()\n", rc, uc->handler);
|
||||
}
|
||||
|
||||
if (uc->ret_handler)
|
||||
|
@@ -210,7 +210,7 @@ static int fei_seq_show(struct seq_file *m, void *v)
|
||||
{
|
||||
struct fei_attr *attr = list_entry(v, struct fei_attr, list);
|
||||
|
||||
seq_printf(m, "%pf\n", attr->kp.addr);
|
||||
seq_printf(m, "%ps\n", attr->kp.addr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@@ -152,7 +152,7 @@ static int irq_debug_show(struct seq_file *m, void *p)
|
||||
|
||||
raw_spin_lock_irq(&desc->lock);
|
||||
data = irq_desc_get_irq_data(desc);
|
||||
seq_printf(m, "handler: %pf\n", desc->handle_irq);
|
||||
seq_printf(m, "handler: %ps\n", desc->handle_irq);
|
||||
seq_printf(m, "device: %s\n", desc->dev_name);
|
||||
seq_printf(m, "status: 0x%08x\n", desc->status_use_accessors);
|
||||
irq_debug_show_bits(m, 0, desc->status_use_accessors, irqdesc_states,
|
||||
|
@@ -149,7 +149,7 @@ irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc, unsigned int *flags
|
||||
res = action->handler(irq, action->dev_id);
|
||||
trace_irq_handler_exit(irq, action, res);
|
||||
|
||||
if (WARN_ONCE(!irqs_disabled(),"irq %u handler %pF enabled interrupts\n",
|
||||
if (WARN_ONCE(!irqs_disabled(),"irq %u handler %pS enabled interrupts\n",
|
||||
irq, action->handler))
|
||||
local_irq_disable();
|
||||
|
||||
|
@@ -778,7 +778,7 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned long flags)
|
||||
ret = 0;
|
||||
break;
|
||||
default:
|
||||
pr_err("Setting trigger mode %lu for irq %u failed (%pF)\n",
|
||||
pr_err("Setting trigger mode %lu for irq %u failed (%pS)\n",
|
||||
flags, irq_desc_get_irq(desc), chip->irq_set_type);
|
||||
}
|
||||
if (unmask)
|
||||
|
@@ -212,9 +212,9 @@ static void __report_bad_irq(struct irq_desc *desc, irqreturn_t action_ret)
|
||||
*/
|
||||
raw_spin_lock_irqsave(&desc->lock, flags);
|
||||
for_each_action_of_desc(desc, action) {
|
||||
printk(KERN_ERR "[<%p>] %pf", action->handler, action->handler);
|
||||
printk(KERN_ERR "[<%p>] %ps", action->handler, action->handler);
|
||||
if (action->thread_fn)
|
||||
printk(KERN_CONT " threaded [<%p>] %pf",
|
||||
printk(KERN_CONT " threaded [<%p>] %ps",
|
||||
action->thread_fn, action->thread_fn);
|
||||
printk(KERN_CONT "\n");
|
||||
}
|
||||
|
@@ -2870,7 +2870,7 @@ __call_rcu(struct rcu_head *head, rcu_callback_t func, int cpu, bool lazy)
|
||||
* Use rcu:rcu_callback trace event to find the previous
|
||||
* time callback was passed to __call_rcu().
|
||||
*/
|
||||
WARN_ONCE(1, "__call_rcu(): Double-freed CB %p->%pF()!!!\n",
|
||||
WARN_ONCE(1, "__call_rcu(): Double-freed CB %p->%pS()!!!\n",
|
||||
head, head->func);
|
||||
WRITE_ONCE(head->func, rcu_leak_callback);
|
||||
return;
|
||||
|
@@ -513,7 +513,7 @@ repeat:
|
||||
}
|
||||
preempt_count_dec();
|
||||
WARN_ONCE(preempt_count(),
|
||||
"cpu_stop: %pf(%p) leaked preempt count\n", fn, arg);
|
||||
"cpu_stop: %ps(%p) leaked preempt count\n", fn, arg);
|
||||
goto repeat;
|
||||
}
|
||||
}
|
||||
|
@@ -231,7 +231,7 @@ sched_clock_register(u64 (*read)(void), int bits, unsigned long rate)
|
||||
if (irqtime > 0 || (irqtime == -1 && rate >= 1000000))
|
||||
enable_sched_clock_irqtime();
|
||||
|
||||
pr_debug("Registered %pF as sched_clock source\n", read);
|
||||
pr_debug("Registered %pS as sched_clock source\n", read);
|
||||
}
|
||||
|
||||
void __init generic_sched_clock_init(void)
|
||||
|
@@ -1328,7 +1328,7 @@ static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list
|
||||
lock_map_release(&lockdep_map);
|
||||
|
||||
if (count != preempt_count()) {
|
||||
WARN_ONCE(1, "timer: %pF preempt leak: %08x -> %08x\n",
|
||||
WARN_ONCE(1, "timer: %pS preempt leak: %08x -> %08x\n",
|
||||
fn, count, preempt_count());
|
||||
/*
|
||||
* Restore the preempt count. That gives us a decent
|
||||
|
@@ -2277,7 +2277,7 @@ __acquires(&pool->lock)
|
||||
|
||||
if (unlikely(in_atomic() || lockdep_depth(current) > 0)) {
|
||||
pr_err("BUG: workqueue leaked lock or atomic: %s/0x%08x/%d\n"
|
||||
" last function: %pf\n",
|
||||
" last function: %ps\n",
|
||||
current->comm, preempt_count(), task_pid_nr(current),
|
||||
worker->current_func);
|
||||
debug_show_held_locks(current);
|
||||
@@ -2596,11 +2596,11 @@ static void check_flush_dependency(struct workqueue_struct *target_wq,
|
||||
worker = current_wq_worker();
|
||||
|
||||
WARN_ONCE(current->flags & PF_MEMALLOC,
|
||||
"workqueue: PF_MEMALLOC task %d(%s) is flushing !WQ_MEM_RECLAIM %s:%pf",
|
||||
"workqueue: PF_MEMALLOC task %d(%s) is flushing !WQ_MEM_RECLAIM %s:%ps",
|
||||
current->pid, current->comm, target_wq->name, target_func);
|
||||
WARN_ONCE(worker && ((worker->current_pwq->wq->flags &
|
||||
(WQ_MEM_RECLAIM | __WQ_LEGACY)) == WQ_MEM_RECLAIM),
|
||||
"workqueue: WQ_MEM_RECLAIM %s:%pf is flushing !WQ_MEM_RECLAIM %s:%pf",
|
||||
"workqueue: WQ_MEM_RECLAIM %s:%ps is flushing !WQ_MEM_RECLAIM %s:%ps",
|
||||
worker->current_pwq->wq->name, worker->current_func,
|
||||
target_wq->name, target_func);
|
||||
}
|
||||
@@ -4582,7 +4582,7 @@ void print_worker_info(const char *log_lvl, struct task_struct *task)
|
||||
probe_kernel_read(desc, worker->desc, sizeof(desc) - 1);
|
||||
|
||||
if (fn || name[0] || desc[0]) {
|
||||
printk("%sWorkqueue: %s %pf", log_lvl, name, fn);
|
||||
printk("%sWorkqueue: %s %ps", log_lvl, name, fn);
|
||||
if (strcmp(name, desc))
|
||||
pr_cont(" (%s)", desc);
|
||||
pr_cont("\n");
|
||||
@@ -4607,7 +4607,7 @@ static void pr_cont_work(bool comma, struct work_struct *work)
|
||||
pr_cont("%s BAR(%d)", comma ? "," : "",
|
||||
task_pid_nr(barr->task));
|
||||
} else {
|
||||
pr_cont("%s %pf", comma ? "," : "", work->func);
|
||||
pr_cont("%s %ps", comma ? "," : "", work->func);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4639,7 +4639,7 @@ static void show_pwq(struct pool_workqueue *pwq)
|
||||
if (worker->current_pwq != pwq)
|
||||
continue;
|
||||
|
||||
pr_cont("%s %d%s:%pf", comma ? "," : "",
|
||||
pr_cont("%s %d%s:%ps", comma ? "," : "",
|
||||
task_pid_nr(worker->task),
|
||||
worker == pwq->wq->rescuer ? "(RESCUER)" : "",
|
||||
worker->current_func);
|
||||
|
Reference in New Issue
Block a user