lib/math: avoid trailing newline hidden in pr_fmt() (9ac17575) · Commits · 戴 / test

pr_xxx() functions usually have a newline at the end of the logging message. Here, this newline is added via the 'pr_fmt' macro. In order to be more consistent with other files, use a more standard convention and put these newlines back in the messages themselves and remove it from the pr_fmt macro. While at it, use __func__ instead of hardcoding a function name in the last message. Signed-off-by:

Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Reviewed-by:

Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20200409163234.22830-1-christophe.jaillet@wanadoo.fr Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

lib/math/prime_numbers.c

+5 −5

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		#define pr_fmt(fmt) "prime numbers: " fmt "\n"
		#define pr_fmt(fmt) "prime numbers: " fmt

		#include <linux/module.h>
		#include <linux/mutex.h>
		@@ -253,7 +253,7 @@ static void dump_primes(void)

		if (buf)
		bitmap_print_to_pagebuf(true, buf, p->primes, p->sz);
		pr_info("primes.{last=%lu, .sz=%lu, .primes[]=...x%lx} = %s",
		pr_info("primes.{last=%lu, .sz=%lu, .primes[]=...x%lx} = %s\n",
		p->last, p->sz, p->primes[BITS_TO_LONGS(p->sz) - 1], buf);

		rcu_read_unlock();
		@@ -273,7 +273,7 @@ static int selftest(unsigned long max)
		bool fast = is_prime_number(x);

		if (slow != fast) {
		pr_err("inconsistent result for is-prime(%lu): slow=%s, fast=%s!",
		pr_err("inconsistent result for is-prime(%lu): slow=%s, fast=%s!\n",
		x, slow ? "yes" : "no", fast ? "yes" : "no");
		goto err;
		}
		@@ -282,14 +282,14 @@ static int selftest(unsigned long max)
		continue;

		if (next_prime_number(last) != x) {
		pr_err("incorrect result for next-prime(%lu): expected %lu, got %lu",
		pr_err("incorrect result for next-prime(%lu): expected %lu, got %lu\n",
		last, x, next_prime_number(last));
		goto err;
		}
		last = x;
		}

		pr_info("selftest(%lu) passed, last prime was %lu", x, last);
		pr_info("%s(%lu) passed, last prime was %lu\n", __func__, x, last);
		return 0;

		err:

Admin message