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

Commit 0b480037 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 89860038

drivers/input/keyboard/atkbd.c

+2 −2
Original line number Diff line number Diff line
@@ -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';

drivers/input/keyboard/gpio_keys.c

+1 −1
Original line number Diff line number Diff line
@@ -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';