Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

workqueue: fix checkpatch issues

Browse source 
Fixed some checkpatch warnings.

tj: adapted to wq/for-3.7 and massaged pr_xxx() format strings a bit.

Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
LKML-Reference: <1345326762-21747-1-git-send-email-valentin.ilie@gmail.com>
This commit is contained in:
Valentin Ilie 2012-08-19 00:52:42 +03:00 committed by Tejun Heo
parent 7635d2fd7f
commit 044c782ce3
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
kernel/workqueue.c
View file

@ -269,18 +269,18 @@ struct workqueue_struct {
}; };
struct workqueue_struct *system_wq __read_mostly; struct workqueue_struct *system_wq __read_mostly;
struct workqueue_struct *system_highpri_wq __read_mostly;
struct workqueue_struct *system_long_wq __read_mostly;
struct workqueue_struct *system_nrt_wq __read_mostly;
struct workqueue_struct *system_unbound_wq __read_mostly;
struct workqueue_struct *system_freezable_wq __read_mostly;
struct workqueue_struct *system_nrt_freezable_wq __read_mostly;
EXPORT_SYMBOL_GPL(system_wq); EXPORT_SYMBOL_GPL(system_wq);
struct workqueue_struct *system_highpri_wq __read_mostly;
EXPORT_SYMBOL_GPL(system_highpri_wq); EXPORT_SYMBOL_GPL(system_highpri_wq);
struct workqueue_struct *system_long_wq __read_mostly;
EXPORT_SYMBOL_GPL(system_long_wq); EXPORT_SYMBOL_GPL(system_long_wq);
struct workqueue_struct *system_nrt_wq __read_mostly;
EXPORT_SYMBOL_GPL(system_nrt_wq); EXPORT_SYMBOL_GPL(system_nrt_wq);
struct workqueue_struct *system_unbound_wq __read_mostly;
EXPORT_SYMBOL_GPL(system_unbound_wq); EXPORT_SYMBOL_GPL(system_unbound_wq);
struct workqueue_struct *system_freezable_wq __read_mostly;
EXPORT_SYMBOL_GPL(system_freezable_wq); EXPORT_SYMBOL_GPL(system_freezable_wq);
struct workqueue_struct *system_nrt_freezable_wq __read_mostly;
EXPORT_SYMBOL_GPL(system_nrt_freezable_wq); EXPORT_SYMBOL_GPL(system_nrt_freezable_wq);
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
@ -2232,11 +2232,9 @@ __acquires(&gcwq->lock)
lock_map_release(&cwq->wq->lockdep_map); lock_map_release(&cwq->wq->lockdep_map);
if (unlikely(in_atomic() || lockdep_depth(current) > 0)) { if (unlikely(in_atomic() || lockdep_depth(current) > 0)) {
printk(KERN_ERR "BUG: workqueue leaked lock or atomic: " pr_err("BUG: workqueue leaked lock or atomic: %s/0x%08x/%d\n"
"%s/0x%08x/%d\n", " last function: %pf\n",
current->comm, preempt_count(), task_pid_nr(current)); current->comm, preempt_count(), task_pid_nr(current), f);
printk(KERN_ERR " last function: ");
print_symbol("%s\n", (unsigned long)f);
debug_show_held_locks(current); debug_show_held_locks(current);
dump_stack(); dump_stack();
} }
@ -2790,8 +2788,8 @@ void drain_workqueue(struct workqueue_struct *wq)
if (++flush_cnt == 10 || if (++flush_cnt == 10 ||
(flush_cnt % 100 == 0 && flush_cnt <= 1000)) (flush_cnt % 100 == 0 && flush_cnt <= 1000))
pr_warning("workqueue %s: flush on destruction isn't complete after %u tries\n", pr_warn("workqueue %s: flush on destruction isn't complete after %u tries\n",
wq->name, flush_cnt); wq->name, flush_cnt);
goto reflush; goto reflush;
} }
@ -3275,9 +3273,8 @@ static int wq_clamp_max_active(int max_active, unsigned int flags,
int lim = flags & WQ_UNBOUND ? WQ_UNBOUND_MAX_ACTIVE : WQ_MAX_ACTIVE; int lim = flags & WQ_UNBOUND ? WQ_UNBOUND_MAX_ACTIVE : WQ_MAX_ACTIVE;
if (max_active < 1 || max_active > lim) if (max_active < 1 || max_active > lim)
printk(KERN_WARNING "workqueue: max_active %d requested for %s " pr_warn("workqueue: max_active %d requested for %s is out of range, clamping between %d and %d\n",
"is out of range, clamping between %d and %d\n", max_active, name, 1, lim);
max_active, name, 1, lim);
return clamp_val(max_active, 1, lim); return clamp_val(max_active, 1, lim);
} }