Skip to content

Commit 125918d

Browse files
htejuntorvalds
htejun
authored and
torvalds
committed
usb: use %*pb[l] to print bitmaps including cpumasks and nodemasks
printk and friends can now format bitmaps using '%*pb[l]'. cpumask and nodemask also provide cpumask_pr_args() and nodemask_pr_args() respectively which can be used to generate the two printf arguments necessary to format the specified cpu/nodemask. * drivers/uwb/drp.c::uwb_drp_handle_alien_drp() was formatting mas.bm into a buffer but never used it. Removed. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent c7badc9 commit 125918d

File tree

6 files changed

+13
-29
lines changed

6 files changed

+13
-29
lines changed

‎drivers/usb/host/whci/debug.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,14 @@ static void qset_print(struct seq_file *s, struct whc_qset *qset)
8686
static int di_print(struct seq_file *s, void *p)
8787
{
8888
struct whc *whc = s->private;
89-
char buf[72];
9089
int d;
9190

9291
for (d = 0; d < whc->n_devices; d++) {
9392
struct di_buf_entry *di = &whc->di_buf[d];
9493

95-
bitmap_scnprintf(buf, sizeof(buf),
96-
(unsigned long *)di->availability_info, UWB_NUM_MAS);
97-
9894
seq_printf(s, "DI[%d]\n", d);
99-
seq_printf(s, " availability: %s\n", buf);
95+
seq_printf(s, " availability: %*pb\n",
96+
UWB_NUM_MAS, (unsigned long *)di->availability_info);
10097
seq_printf(s, " %c%c key idx: %d dev addr: %d\n",
10198
(di->addr_sec_info & WHC_DI_SECURE) ? 'S' : ' ',
10299
(di->addr_sec_info & WHC_DI_DISABLE) ? 'D' : ' ',

‎drivers/usb/wusbcore/reservation.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,13 @@ static void wusbhc_rsv_complete_cb(struct uwb_rsv *rsv)
4949
struct wusbhc *wusbhc = rsv->pal_priv;
5050
struct device *dev = wusbhc->dev;
5151
struct uwb_mas_bm mas;
52-
char buf[72];
5352

5453
dev_dbg(dev, "%s: state = %d\n", __func__, rsv->state);
5554
switch (rsv->state) {
5655
case UWB_RSV_STATE_O_ESTABLISHED:
5756
uwb_rsv_get_usable_mas(rsv, &mas);
58-
bitmap_scnprintf(buf, sizeof(buf), mas.bm, UWB_NUM_MAS);
59-
dev_dbg(dev, "established reservation: %s\n", buf);
57+
dev_dbg(dev, "established reservation: %*pb\n",
58+
UWB_NUM_MAS, mas.bm);
6059
wusbhc_bwa_set(wusbhc, rsv->stream, &mas);
6160
break;
6261
case UWB_RSV_STATE_NONE:

‎drivers/usb/wusbcore/wa-rpipe.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,10 +496,9 @@ void wa_rpipes_destroy(struct wahc *wa)
496496
struct device *dev = &wa->usb_iface->dev;
497497

498498
if (!bitmap_empty(wa->rpipe_bm, wa->rpipes)) {
499-
char buf[256];
500499
WARN_ON(1);
501-
bitmap_scnprintf(buf, sizeof(buf), wa->rpipe_bm, wa->rpipes);
502-
dev_err(dev, "BUG: pipes not released on exit: %s\n", buf);
500+
dev_err(dev, "BUG: pipes not released on exit: %*pb\n",
501+
wa->rpipes, wa->rpipe_bm);
503502
}
504503
kfree(wa->rpipe_bm);
505504
}

‎drivers/usb/wusbcore/wusbhc.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -496,11 +496,8 @@ static void __exit wusbcore_exit(void)
496496
{
497497
clear_bit(0, wusb_cluster_id_table);
498498
if (!bitmap_empty(wusb_cluster_id_table, CLUSTER_IDS)) {
499-
char buf[256];
500-
bitmap_scnprintf(buf, sizeof(buf), wusb_cluster_id_table,
501-
CLUSTER_IDS);
502-
printk(KERN_ERR "BUG: WUSB Cluster IDs not released "
503-
"on exit: %s\n", buf);
499+
printk(KERN_ERR "BUG: WUSB Cluster IDs not released on exit: %*pb\n",
500+
CLUSTER_IDS, wusb_cluster_id_table);
504501
WARN_ON(1);
505502
}
506503
usb_unregister_notify(&wusb_usb_notifier);

‎drivers/uwb/drp.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,11 +619,9 @@ static void uwb_drp_handle_alien_drp(struct uwb_rc *rc, struct uwb_ie_drp *drp_i
619619
struct device *dev = &rc->uwb_dev.dev;
620620
struct uwb_mas_bm mas;
621621
struct uwb_cnflt_alien *cnflt;
622-
char buf[72];
623622
unsigned long delay_us = UWB_MAS_LENGTH_US * UWB_MAS_PER_ZONE;
624623

625624
uwb_drp_ie_to_bm(&mas, drp_ie);
626-
bitmap_scnprintf(buf, sizeof(buf), mas.bm, UWB_NUM_MAS);
627625

628626
list_for_each_entry(cnflt, &rc->cnflt_alien_list, rc_node) {
629627
if (bitmap_equal(cnflt->mas.bm, mas.bm, UWB_NUM_MAS)) {

‎drivers/uwb/uwb-debug.c

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ static int reservations_print(struct seq_file *s, void *p)
217217
struct uwb_dev_addr devaddr;
218218
char owner[UWB_ADDR_STRSIZE], target[UWB_ADDR_STRSIZE];
219219
bool is_owner;
220-
char buf[72];
221220

222221
uwb_dev_addr_print(owner, sizeof(owner), &rsv->owner->dev_addr);
223222
if (rsv->target.type == UWB_RSV_TARGET_DEV) {
@@ -234,8 +233,7 @@ static int reservations_print(struct seq_file *s, void *p)
234233
owner, target, uwb_rsv_state_str(rsv->state));
235234
seq_printf(s, " stream: %d type: %s\n",
236235
rsv->stream, uwb_rsv_type_str(rsv->type));
237-
bitmap_scnprintf(buf, sizeof(buf), rsv->mas.bm, UWB_NUM_MAS);
238-
seq_printf(s, " %s\n", buf);
236+
seq_printf(s, " %*pb\n", UWB_NUM_MAS, rsv->mas.bm);
239237
}
240238

241239
mutex_unlock(&rc->rsvs_mutex);
@@ -259,14 +257,10 @@ static const struct file_operations reservations_fops = {
259257
static int drp_avail_print(struct seq_file *s, void *p)
260258
{
261259
struct uwb_rc *rc = s->private;
262-
char buf[72];
263-
264-
bitmap_scnprintf(buf, sizeof(buf), rc->drp_avail.global, UWB_NUM_MAS);
265-
seq_printf(s, "global: %s\n", buf);
266-
bitmap_scnprintf(buf, sizeof(buf), rc->drp_avail.local, UWB_NUM_MAS);
267-
seq_printf(s, "local: %s\n", buf);
268-
bitmap_scnprintf(buf, sizeof(buf), rc->drp_avail.pending, UWB_NUM_MAS);
269-
seq_printf(s, "pending: %s\n", buf);
260+
261+
seq_printf(s, "global: %*pb\n", UWB_NUM_MAS, rc->drp_avail.global);
262+
seq_printf(s, "local: %*pb\n", UWB_NUM_MAS, rc->drp_avail.local);
263+
seq_printf(s, "pending: %*pb\n", UWB_NUM_MAS, rc->drp_avail.pending);
270264

271265
return 0;
272266
}

0 commit comments

Comments
 (0)