From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932477AbbD0Jri (ORCPT ); Mon, 27 Apr 2015 05:47:38 -0400 Received: from foss.arm.com ([217.140.101.70]:56254 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932157AbbD0Jrg (ORCPT ); Mon, 27 Apr 2015 05:47:36 -0400 From: Sudeep Holla To: linux-kernel@vger.kernel.org Cc: Sudeep Holla , Pawel Moll , Andrew Morton , Tejun Heo , "Peter Zijlstra (Intel)" Subject: [PATCH] bitmap: remove explicit newline handling using scnprintf format string Date: Mon, 27 Apr 2015 10:46:58 +0100 Message-Id: <1430128018-14667-1-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org bitmap_print_to_pagebuf uses scnprintf to copy the cpumask/list to page buffer. It handles the newline and trailing null character explicitly. It's unnecessary and also partially duplicated as scnprintf already adds trailing null character. The newline can be passed through format string to scnprintf. This patch does that simplification. Cc: Andrew Morton Cc: Tejun Heo Cc: "Peter Zijlstra (Intel)" Suggested-by: Pawel Moll Signed-off-by: Sudeep Holla --- lib/bitmap.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/bitmap.c b/lib/bitmap.c index 64c0926f5dd8..9b24b57b4b01 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c @@ -466,15 +466,12 @@ EXPORT_SYMBOL(bitmap_parse_user); int bitmap_print_to_pagebuf(bool list, char *buf, const unsigned long *maskp, int nmaskbits) { - ptrdiff_t len = PTR_ALIGN(buf + PAGE_SIZE - 1, PAGE_SIZE) - buf - 2; + ptrdiff_t len = PTR_ALIGN(buf + PAGE_SIZE - 1, PAGE_SIZE) - buf; int n = 0; - if (len > 1) { - n = list ? scnprintf(buf, len, "%*pbl", nmaskbits, maskp) : - scnprintf(buf, len, "%*pb", nmaskbits, maskp); - buf[n++] = '\n'; - buf[n] = '\0'; - } + if (len > 1) + n = list ? scnprintf(buf, len, "%*pbl\n", nmaskbits, maskp) : + scnprintf(buf, len, "%*pb\n", nmaskbits, maskp); return n; } EXPORT_SYMBOL(bitmap_print_to_pagebuf); -- 1.9.1