public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: <zhang.songyi@zte.com.cn>
To: <rostedt@goodmis.org>, <mhiramat@kernel.org>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH linux-next] ring_buffer: remove redundant ret variables
Date: Mon, 28 Nov 2022 21:10:00 +0800 (CST)	[thread overview]
Message-ID: <202211282110006083500@zte.com.cn> (raw)

From: zhang songyi <zhang.songyi@zte.com.cn>

Return values from ring_buffer_bytes_cpu(), ring_buffer_overrun_cpu(),
ring_buffer_commit_overrun_cpu(), ring_buffer_dropped_events_cpu()
directly instead of taking this in another redundant variable.

Signed-off-by: zhang songyi <zhang.songyi@zte.com.cn>
---
 kernel/trace/ring_buffer.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 843818ee4814..353c90ce7640 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -4224,15 +4224,13 @@ EXPORT_SYMBOL_GPL(ring_buffer_oldest_event_ts);
 unsigned long ring_buffer_bytes_cpu(struct trace_buffer *buffer, int cpu)
 {
        struct ring_buffer_per_cpu *cpu_buffer;
-       unsigned long ret;

        if (!cpumask_test_cpu(cpu, buffer->cpumask))
                return 0;

        cpu_buffer = buffer->buffers[cpu];
-       ret = local_read(&cpu_buffer->entries_bytes) - cpu_buffer->read_bytes;

-       return ret;
+       return local_read(&cpu_buffer->entries_bytes) - cpu_buffer->read_bytes;
 }
 EXPORT_SYMBOL_GPL(ring_buffer_bytes_cpu);

@@ -4263,15 +4261,13 @@ EXPORT_SYMBOL_GPL(ring_buffer_entries_cpu);
 unsigned long ring_buffer_overrun_cpu(struct trace_buffer *buffer, int cpu)
 {
        struct ring_buffer_per_cpu *cpu_buffer;
-       unsigned long ret;

        if (!cpumask_test_cpu(cpu, buffer->cpumask))
                return 0;

        cpu_buffer = buffer->buffers[cpu];
-       ret = local_read(&cpu_buffer->overrun);

-       return ret;
+       return local_read(&cpu_buffer->overrun);
 }
 EXPORT_SYMBOL_GPL(ring_buffer_overrun_cpu);

@@ -4286,15 +4282,13 @@ unsigned long
 ring_buffer_commit_overrun_cpu(struct trace_buffer *buffer, int cpu)
 {
        struct ring_buffer_per_cpu *cpu_buffer;
-       unsigned long ret;

        if (!cpumask_test_cpu(cpu, buffer->cpumask))
                return 0;

        cpu_buffer = buffer->buffers[cpu];
-       ret = local_read(&cpu_buffer->commit_overrun);

-       return ret;
+       return local_read(&cpu_buffer->commit_overrun);
 }
 EXPORT_SYMBOL_GPL(ring_buffer_commit_overrun_cpu);

@@ -4308,15 +4302,13 @@ unsigned long
 ring_buffer_dropped_events_cpu(struct trace_buffer *buffer, int cpu)
 {
        struct ring_buffer_per_cpu *cpu_buffer;
-       unsigned long ret;

        if (!cpumask_test_cpu(cpu, buffer->cpumask))
                return 0;

        cpu_buffer = buffer->buffers[cpu];
-       ret = local_read(&cpu_buffer->dropped_events);

-       return ret;
+       return local_read(&cpu_buffer->dropped_events);
 }
 EXPORT_SYMBOL_GPL(ring_buffer_dropped_events_cpu);

--
2.15.2

             reply	other threads:[~2022-11-28 13:10 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-28 13:10 zhang.songyi [this message]
2022-11-28 18:00 ` [PATCH linux-next] ring_buffer: remove redundant ret variables Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=202211282110006083500@zte.com.cn \
    --to=zhang.songyi@zte.com.cn \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=rostedt@goodmis.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox