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>

diff --git a/drivers/usb/host/whci/debug.c b/drivers/usb/host/whci/debug.c
index ba61dae9e4d2ce84bf5d75f12754ab4bf8d5d2c5..774b89d28fae29a22ec94f8cd8f433056f8da5a8 100644 (file)
--- a/drivers/usb/host/whci/debug.c
+++ b/drivers/usb/host/whci/debug.c
@@ -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' : ' ',

diff --git a/drivers/usb/wusbcore/reservation.c b/drivers/usb/wusbcore/reservation.c
index d5efd0f07d2b9f5e836022a868a7bf3f25269638..7b1b2e2fb673caaabbdbc339778846c950d23c3d 100644 (file)
--- 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)
        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:

diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c
index a80c5d284b5902621b2d1d7b8bc2b5309d2dc25a..c7ecdbe19a32b6386d02bc11373a1276666369bd 100644 (file)
--- 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)
        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);
 }

diff --git a/drivers/usb/wusbcore/wusbhc.c b/drivers/usb/wusbcore/wusbhc.c
index 3e1ba51d1a43dd5eb0dc5bf37c90954ce0000a36..94f401ab859f4c000634628b9364f2a71c313a13 100644 (file)
--- a/drivers/usb/wusbcore/wusbhc.c
+++ b/drivers/usb/wusbcore/wusbhc.c
@@ -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);

diff --git a/drivers/uwb/drp.c b/drivers/uwb/drp.c
index 05b7bd7622549ec1693d2c248cc45c2b6c8ca444..8fc1b787dceddd333b6c98cb99a4ea95fa81ec08 100644 (file)
--- a/drivers/uwb/drp.c
+++ b/drivers/uwb/drp.c
@@ -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)) {

diff --git a/drivers/uwb/uwb-debug.c b/drivers/uwb/uwb-debug.c
index 6ec45beb7af5e5bf55756e6d622447dc989dfc48..0b1e5a9449b5cd327cd93e7c5272c388c9aa75e3 100644 (file)
--- a/drivers/uwb/uwb-debug.c
+++ b/drivers/uwb/uwb-debug.c
@@ -217,7 +217,6 @@ static int reservations_print(struct seq_file *s, void *p)
                struct uwb_dev_addr devaddr;
                char owner[UWB_ADDR_STRSIZE], target[UWB_ADDR_STRSIZE];
                bool is_owner;
-               char buf[72];
 
                uwb_dev_addr_print(owner, sizeof(owner), &rsv->owner->dev_addr);
                if (rsv->target.type == UWB_RSV_TARGET_DEV) {
@@ -234,8 +233,7 @@ static int reservations_print(struct seq_file *s, void *p)
                           owner, target, uwb_rsv_state_str(rsv->state));
                seq_printf(s, "  stream: %d  type: %s\n",
                           rsv->stream, uwb_rsv_type_str(rsv->type));
-               bitmap_scnprintf(buf, sizeof(buf), rsv->mas.bm, UWB_NUM_MAS);
-               seq_printf(s, "  %s\n", buf);
+               seq_printf(s, "  %*pb\n", UWB_NUM_MAS, rsv->mas.bm);
        }
 
        mutex_unlock(&rc->rsvs_mutex);
@@ -259,14 +257,10 @@ static const struct file_operations reservations_fops = {
 static int drp_avail_print(struct seq_file *s, void *p)
 {
        struct uwb_rc *rc = s->private;
-       char buf[72];
-
-       bitmap_scnprintf(buf, sizeof(buf), rc->drp_avail.global, UWB_NUM_MAS);
-       seq_printf(s, "global:  %s\n", buf);
-       bitmap_scnprintf(buf, sizeof(buf), rc->drp_avail.local, UWB_NUM_MAS);
-       seq_printf(s, "local:   %s\n", buf);
-       bitmap_scnprintf(buf, sizeof(buf), rc->drp_avail.pending, UWB_NUM_MAS);
-       seq_printf(s, "pending: %s\n", buf);
+
+       seq_printf(s, "global:  %*pb\n", UWB_NUM_MAS, rc->drp_avail.global);
+       seq_printf(s, "local:   %*pb\n", UWB_NUM_MAS, rc->drp_avail.local);
+       seq_printf(s, "pending: %*pb\n", UWB_NUM_MAS, rc->drp_avail.pending);
 
        return 0;
 }