aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/wusbcore
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2015-02-13 17:37:53 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-14 00:21:38 -0500
commit125918dbd836d19b5dccc2690388b29e575f91a4 (patch)
treec8f4912388e074a6c37ec64fb74205a584b61acc /drivers/usb/wusbcore
parentc7badc90178b89c49e3852a002024d26cef5f070 (diff)
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>
Diffstat (limited to 'drivers/usb/wusbcore')
-rw-r--r--drivers/usb/wusbcore/reservation.c5
-rw-r--r--drivers/usb/wusbcore/wa-rpipe.c5
-rw-r--r--drivers/usb/wusbcore/wusbhc.c7
3 files changed, 6 insertions, 11 deletions
diff --git a/drivers/usb/wusbcore/reservation.c b/drivers/usb/wusbcore/reservation.c
index d5efd0f07d2b..7b1b2e2fb673 100644
--- a/drivers/usb/wusbcore/reservation.c
+++ b/drivers/usb/wusbcore/reservation.c
@@ -49,14 +49,13 @@ static void wusbhc_rsv_complete_cb(struct uwb_rsv *rsv)
49 struct wusbhc *wusbhc = rsv->pal_priv; 49 struct wusbhc *wusbhc = rsv->pal_priv;
50 struct device *dev = wusbhc->dev; 50 struct device *dev = wusbhc->dev;
51 struct uwb_mas_bm mas; 51 struct uwb_mas_bm mas;
52 char buf[72];
53 52
54 dev_dbg(dev, "%s: state = %d\n", __func__, rsv->state); 53 dev_dbg(dev, "%s: state = %d\n", __func__, rsv->state);
55 switch (rsv->state) { 54 switch (rsv->state) {
56 case UWB_RSV_STATE_O_ESTABLISHED: 55 case UWB_RSV_STATE_O_ESTABLISHED:
57 uwb_rsv_get_usable_mas(rsv, &mas); 56 uwb_rsv_get_usable_mas(rsv, &mas);
58 bitmap_scnprintf(buf, sizeof(buf), mas.bm, UWB_NUM_MAS); 57 dev_dbg(dev, "established reservation: %*pb\n",
59 dev_dbg(dev, "established reservation: %s\n", buf); 58 UWB_NUM_MAS, mas.bm);
60 wusbhc_bwa_set(wusbhc, rsv->stream, &mas); 59 wusbhc_bwa_set(wusbhc, rsv->stream, &mas);
61 break; 60 break;
62 case UWB_RSV_STATE_NONE: 61 case UWB_RSV_STATE_NONE:
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c
index a80c5d284b59..c7ecdbe19a32 100644
--- a/drivers/usb/wusbcore/wa-rpipe.c
+++ b/drivers/usb/wusbcore/wa-rpipe.c
@@ -496,10 +496,9 @@ void wa_rpipes_destroy(struct wahc *wa)
496 struct device *dev = &wa->usb_iface->dev; 496 struct device *dev = &wa->usb_iface->dev;
497 497
498 if (!bitmap_empty(wa->rpipe_bm, wa->rpipes)) { 498 if (!bitmap_empty(wa->rpipe_bm, wa->rpipes)) {
499 char buf[256];
500 WARN_ON(1); 499 WARN_ON(1);
501 bitmap_scnprintf(buf, sizeof(buf), wa->rpipe_bm, wa->rpipes); 500 dev_err(dev, "BUG: pipes not released on exit: %*pb\n",
502 dev_err(dev, "BUG: pipes not released on exit: %s\n", buf); 501 wa->rpipes, wa->rpipe_bm);
503 } 502 }
504 kfree(wa->rpipe_bm); 503 kfree(wa->rpipe_bm);
505} 504}
diff --git a/drivers/usb/wusbcore/wusbhc.c b/drivers/usb/wusbcore/wusbhc.c
index 3e1ba51d1a43..94f401ab859f 100644
--- a/drivers/usb/wusbcore/wusbhc.c
+++ b/drivers/usb/wusbcore/wusbhc.c
@@ -496,11 +496,8 @@ static void __exit wusbcore_exit(void)
496{ 496{
497 clear_bit(0, wusb_cluster_id_table); 497 clear_bit(0, wusb_cluster_id_table);
498 if (!bitmap_empty(wusb_cluster_id_table, CLUSTER_IDS)) { 498 if (!bitmap_empty(wusb_cluster_id_table, CLUSTER_IDS)) {
499 char buf[256]; 499 printk(KERN_ERR "BUG: WUSB Cluster IDs not released on exit: %*pb\n",
500 bitmap_scnprintf(buf, sizeof(buf), wusb_cluster_id_table, 500 CLUSTER_IDS, wusb_cluster_id_table);
501 CLUSTER_IDS);
502 printk(KERN_ERR "BUG: WUSB Cluster IDs not released "
503 "on exit: %s\n", buf);
504 WARN_ON(1); 501 WARN_ON(1);
505 } 502 }
506 usb_unregister_notify(&wusb_usb_notifier); 503 usb_unregister_notify(&wusb_usb_notifier);