[PATCH] ring-buffer: simplify if-if to if-else

[PATCH] ring-buffer: simplify if-if to if-else

[Wan Jiabing]

Use if and else instead of if(A) and if (!A).

Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
 kernel/trace/ring_buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 05dfc7a12d3d..0fa21bd1a1e9 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -6014,7 +6014,7 @@ static __init int test_ringbuffer(void)
 		if (total_lost)
 			pr_info(" With dropped events, record len and size may not match\n"
 				" alloced and written from above\n");
-		if (!total_lost) {
+		else {
 			if (RB_WARN_ON(buffer, total_len != total_alloc ||
 				       total_size != total_written))
 				break;
-- 
2.35.1

Re: [PATCH] ring-buffer: simplify if-if to if-else

[Joe Perches]

On Sun, 2022-04-24 at 17:34 +0800, Wan Jiabing wrote:
> Use if and else instead of if(A) and if (!A).
[]
> diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
[]
> @@ -6014,7 +6014,7 @@ static __init int test_ringbuffer(void)
>  		if (total_lost)
>  			pr_info(" With dropped events, record len and size may not match\n"
>  				" alloced and written from above\n");
> -		if (!total_lost) {
> +		else {

please run your proposed patches through checkpatch.

(add braces to the if block)

additionally:

the pr_info on two lines seems pointless and it's probably nicer
just written on a single line.

			pr_info(" With dropped events, recorded len and size may not match alloced and written from above\n");

>  			if (RB_WARN_ON(buffer, total_len != total_alloc ||
>  				       total_size != total_written))
>  				break;

Re: [PATCH] ring-buffer: simplify if-if to if-else

[Steven Rostedt]

On Sun, 24 Apr 2022 09:12:45 -0700
Joe Perches <joe@perches.com> wrote:

> the pr_info on two lines seems pointless and it's probably nicer
> just written on a single line.
> 
> 			pr_info(" With dropped events, recorded len and size may not match alloced and written from above\n");

Which makes it 86 characters long, and this test is run on my machine that
has a 80 character console.

Please keep the original line breakage.

-- Steve