From patchwork Mon Nov 28 13:10:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhang.songyi@zte.com.cn X-Patchwork-Id: 26745 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5655903wrr; Mon, 28 Nov 2022 05:13:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ueZeIdYE7vUpJ0vc+OPtk0IljQ7fPpv5iIv/NVSCeP2mlp6xKD4/ZvROz0fnGnbhTYRjt X-Received: by 2002:a17:906:8493:b0:7be:a769:2f41 with SMTP id m19-20020a170906849300b007bea7692f41mr6589999ejx.690.1669641191202; Mon, 28 Nov 2022 05:13:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669641191; cv=none; d=google.com; s=arc-20160816; b=mLV5Aw4cA6iINgY2C8DbQN4Bo9fHfoOd6AB3xAVLSj/TZjA67Q2EZSJZj2syeuJsxZ isDtLnjGKYLN69G+st8bEMA/WKxsTJbBne2TvD5iLZISsbIlh8SqbImfG/82hlfzIIkO woHMAykBNAhZj52xqTzRnaEvT/O3Kf5/QIve1Prs1u0NklyOFZx/o3WBGmJYofQ8W9zp /bj/p9ciFpIEh/hDSVWsngM1pmdXa55bRggIf5JyCDeSTMoNF/5/v3uakGXKZNyB4u1v cyQmaA8+Elg7vNd0ekQM34kzrMM166s3ep6n+qqXnIeLVtqSnZKk91MsJJ693ScIBo+I eFCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=DRHq0krHsf3+927+ho/FnPwNtahoRHycSX+/0ErMUNA=; b=I/izUhIYZ5UIowztpZa6EgYyiSPX2ErowoEPY4O6gOuZXnKr9HJ9fJ4BBb5BLCN98U kzCpJuEJU0N1OfYsKdNRV1uYhGk8w/dfG0flHYBSjR2EiqBny30Z3gmcUp5S3i/8njn6 qyv1WecJl37zLAJUL4tM7yMDhoKHkuj16FgVfw+DfeWzGaqdfMuwxHmgQHM65KNFdUwQ 7370eMDAdFnUo4IcxT/IO57hsbs/w4Yjwr0yO0u6ohj4/dtF7RdD/FPorotLvWBooKls ZvbWk1mfEQflgpVgMv2N6hhagvFPCBkE6AAhr4MwICNlXyOBtbsi9bobDzin+IHf7Yne DDKA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mp34-20020a1709071b2200b0078e27f2ef52si10502422ejc.603.2022.11.28.05.12.43; Mon, 28 Nov 2022 05:13:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231502AbiK1NKL (ORCPT + 99 others); Mon, 28 Nov 2022 08:10:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230364AbiK1NKJ (ORCPT ); Mon, 28 Nov 2022 08:10:09 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FE091B9C9 for ; Mon, 28 Nov 2022 05:10:07 -0800 (PST) Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4NLQms5JrMz8QrkZ; Mon, 28 Nov 2022 21:10:05 +0800 (CST) Received: from xaxapp01.zte.com.cn ([10.88.40.50]) by mse-fl2.zte.com.cn with SMTP id 2ASD9vBr026909; Mon, 28 Nov 2022 21:09:57 +0800 (+08) (envelope-from zhang.songyi@zte.com.cn) Received: from mapi (xaxapp02[null]) by mapi (Zmail) with MAPI id mid31; Mon, 28 Nov 2022 21:10:00 +0800 (CST) Date: Mon, 28 Nov 2022 21:10:00 +0800 (CST) X-Zmail-TransId: 2afa6384b328ffffffff9b189469 X-Mailer: Zmail v1.0 Message-ID: <202211282110006083500@zte.com.cn> Mime-Version: 1.0 From: To: , Cc: Subject: =?utf-8?q?=5BPATCH_linux-next=5D_ring=5Fbuffer=3A_remove_redundant_?= =?utf-8?q?ret_variables?= X-MAIL: mse-fl2.zte.com.cn 2ASD9vBr026909 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.137.novalocal with ID 6384B32D.000 by FangMail milter! X-FangMail-Envelope: 1669641005/4NLQms5JrMz8QrkZ/6384B32D.000/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 6384B32D.000/4NLQms5JrMz8QrkZ X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750745681735074225?= X-GMAIL-MSGID: =?utf-8?q?1750745681735074225?= From: zhang songyi 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 --- kernel/trace/ring_buffer.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) -- 2.15.2 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);