Skip to contentSkip to conversation

ring_buffer: remove redundant ret variables

PATCH In review [email protected] 2 participants 2 messages Nov 28, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ring_buffer: remove redundant ret variables

From: zhang songyi <[email protected]>

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.

---
 kernel/trace/ring_buffer.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
kernel/trace/ring_buffer.c +4 -12
index 843818ee4814..353c90ce7640 100644
@@ -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

maintainer
#1 lore raw
Quoted 8 lines · On Mon, 28 Nov 2022 21:10:00 +0800 (CST) <[email protected]> wrote:

From: zhang songyi <[email protected]>

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.

---

Fine, I may add this, as it looks like leftovers from 8aabee573dff ("ring-buffer: remove unneeded get_online_cpus"). But they make no real difference staying as is.

-- Steve