input: 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.

* Line termination only requires one extra space at the end of the
  buffer.  Use PAGE_SIZE - 1 instead of PAGE_SIZE - 2 when formatting.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index e27a25892db46ccb94b13e7892e3b19c361d075a..387c51f4b4e42960ad1de701cb421d9ee1463962 100644 (file)
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -1399,8 +1399,8 @@ static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t coun
 
 static ssize_t atkbd_show_force_release(struct atkbd *atkbd, char *buf)
 {
-       size_t len = bitmap_scnlistprintf(buf, PAGE_SIZE - 2,
-                       atkbd->force_release_mask, ATKBD_KEYMAP_SIZE);
+       size_t len = scnprintf(buf, PAGE_SIZE - 1, "%*pbl",
+                              ATKBD_KEYMAP_SIZE, atkbd->force_release_mask);
 
        buf[len++] = '\n';
        buf[len] = '\0';

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 883d6aed5b9ac12f47bc3a137bbf8e61c0bd1ec2..ddf4045de08466210788ed583066b482e3951e38 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -190,7 +190,7 @@ static ssize_t gpio_keys_attr_show_helper(struct gpio_keys_drvdata *ddata,
                __set_bit(bdata->button->code, bits);
        }
 
-       ret = bitmap_scnlistprintf(buf, PAGE_SIZE - 2, bits, n_events);
+       ret = scnprintf(buf, PAGE_SIZE - 1, "%*pbl", n_events, bits);
        buf[ret++] = '\n';
        buf[ret] = '\0';