input: use %*pb[l] to print bitmaps including cpumasks and nodemasks

htejun · torvalds · commit 0b480037e8eb · 2015-02-13T21:21:38.000-08:00
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 &lt;tj@kernel.org&gt;
Cc: Dmitry Torokhov &lt;dmitry.torokhov@gmail.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git 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
@@ -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';
 

Original file line number	Diff line number	Diff line change
`@@ -1399,8 +1399,8 @@ static ssize_t atkbd_set_extra(struct atkbd atkbd, const char buf, size_t coun`
`1399`	`1399`
`1400`	`1400`	`static ssize_t atkbd_show_force_release(struct atkbd atkbd, char buf)`
`1401`	`1401`	`{`
`1402`		`- size_t len = bitmap_scnlistprintf(buf, PAGE_SIZE - 2,`
`1403`		`- atkbd->force_release_mask, ATKBD_KEYMAP_SIZE);`
	`1402`	`+ size_t len = scnprintf(buf, PAGE_SIZE - 1, "%*pbl",`
	`1403`	`+ ATKBD_KEYMAP_SIZE, atkbd->force_release_mask);`
`1404`	`1404`
`1405`	`1405`	`buf[len++] = '\n';`
`1406`	`1406`	`buf[len] = '\0';`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ static ssize_t gpio_keys_attr_show_helper(struct gpio_keys_drvdata *ddata,`
`190`	`190`	`__set_bit(bdata->button->code, bits);`
`191`	`191`	`}`
`192`	`192`
`193`		`- ret = bitmap_scnlistprintf(buf, PAGE_SIZE - 2, bits, n_events);`
	`193`	`+ ret = scnprintf(buf, PAGE_SIZE - 1, "%*pbl", n_events, bits);`
`194`	`194`	`buf[ret++] = '\n';`
`195`	`195`	`buf[ret] = '\0';`
`196`	`196`