Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 125918db authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c7badc90

drivers/usb/host/whci/debug.c

+2 −5
Original line number Diff line number Diff line
@@ -86,17 +86,14 @@ static void qset_print(struct seq_file *s, struct whc_qset *qset) 
static int di_print(struct seq_file *s, void *p)

{

	struct whc *whc = s->private;

	char buf[72];

	int d;



	for (d = 0; d < whc->n_devices; d++) {

		struct di_buf_entry *di = &whc->di_buf[d];



		bitmap_scnprintf(buf, sizeof(buf),

				 (unsigned long *)di->availability_info, UWB_NUM_MAS);



		seq_printf(s, "DI[%d]\n", d);

		seq_printf(s, "  availability: %s\n", buf);

		seq_printf(s, "  availability: %*pb\n",

			   UWB_NUM_MAS, (unsigned long *)di->availability_info);

		seq_printf(s, "  %c%c key idx: %d dev addr: %d\n",

			   (di->addr_sec_info & WHC_DI_SECURE) ? 'S' : ' ',

			   (di->addr_sec_info & WHC_DI_DISABLE) ? 'D' : ' ',

drivers/usb/wusbcore/reservation.c

+2 −3
Original line number Diff line number Diff line
@@ -49,14 +49,13 @@ static void wusbhc_rsv_complete_cb(struct uwb_rsv *rsv) 
	struct wusbhc *wusbhc = rsv->pal_priv;

	struct device *dev = wusbhc->dev;

	struct uwb_mas_bm mas;

	char buf[72];



	dev_dbg(dev, "%s: state = %d\n", __func__, rsv->state);

	switch (rsv->state) {

	case UWB_RSV_STATE_O_ESTABLISHED:

		uwb_rsv_get_usable_mas(rsv, &mas);

		bitmap_scnprintf(buf, sizeof(buf), mas.bm, UWB_NUM_MAS);

		dev_dbg(dev, "established reservation: %s\n", buf);

		dev_dbg(dev, "established reservation: %*pb\n",

			UWB_NUM_MAS, mas.bm);

		wusbhc_bwa_set(wusbhc, rsv->stream, &mas);

		break;

	case UWB_RSV_STATE_NONE:

drivers/usb/wusbcore/wa-rpipe.c

+2 −3
Original line number Diff line number Diff line
@@ -496,10 +496,9 @@ void wa_rpipes_destroy(struct wahc *wa) 
	struct device *dev = &wa->usb_iface->dev;



	if (!bitmap_empty(wa->rpipe_bm, wa->rpipes)) {

		char buf[256];

		WARN_ON(1);

		bitmap_scnprintf(buf, sizeof(buf), wa->rpipe_bm, wa->rpipes);

		dev_err(dev, "BUG: pipes not released on exit: %s\n", buf);

		dev_err(dev, "BUG: pipes not released on exit: %*pb\n",

			wa->rpipes, wa->rpipe_bm);

	}

	kfree(wa->rpipe_bm);

}

drivers/usb/wusbcore/wusbhc.c

+2 −5
Original line number Diff line number Diff line
@@ -496,11 +496,8 @@ static void __exit wusbcore_exit(void) 
{

	clear_bit(0, wusb_cluster_id_table);

	if (!bitmap_empty(wusb_cluster_id_table, CLUSTER_IDS)) {

		char buf[256];

		bitmap_scnprintf(buf, sizeof(buf), wusb_cluster_id_table,

				 CLUSTER_IDS);

		printk(KERN_ERR "BUG: WUSB Cluster IDs not released "

		       "on exit: %s\n", buf);

		printk(KERN_ERR "BUG: WUSB Cluster IDs not released on exit: %*pb\n",

		       CLUSTER_IDS, wusb_cluster_id_table);

		WARN_ON(1);

	}

	usb_unregister_notify(&wusb_usb_notifier);

drivers/uwb/drp.c

+0 −2
Original line number Diff line number Diff line
@@ -619,11 +619,9 @@ static void uwb_drp_handle_alien_drp(struct uwb_rc *rc, struct uwb_ie_drp *drp_i 
	struct device *dev = &rc->uwb_dev.dev;

	struct uwb_mas_bm mas;

	struct uwb_cnflt_alien *cnflt;

	char buf[72];

	unsigned long delay_us = UWB_MAS_LENGTH_US * UWB_MAS_PER_ZONE;



	uwb_drp_ie_to_bm(&mas, drp_ie);

	bitmap_scnprintf(buf, sizeof(buf), mas.bm, UWB_NUM_MAS);



	list_for_each_entry(cnflt, &rc->cnflt_alien_list, rc_node) {

		if (bitmap_equal(cnflt->mas.bm, mas.bm, UWB_NUM_MAS)) {