From patchwork Wed Mar 22 18:42:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 73618 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2504584wrt; Wed, 22 Mar 2023 11:45:21 -0700 (PDT) X-Google-Smtp-Source: AK7set/5F6C8414HzdisClDqEecSjvQVw91Kyd/A9tB5OT59Uxml16fP6j7dSKzC6D6nxBDb1DrJ X-Received: by 2002:a62:6304:0:b0:5a8:ad9d:83f with SMTP id x4-20020a626304000000b005a8ad9d083fmr3440708pfb.24.1679510720662; Wed, 22 Mar 2023 11:45:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679510720; cv=none; d=google.com; s=arc-20160816; b=W9pL0PczhHljxsiErc0sPQF0gHTfYQcLNxL9G1wH2M9XeC58PLA7TVW7J6JD2h1JmN HrmwPuVT5VHxCfGE1uQDku2ze1/9fnCQ015pokQNQ5S2t8auJghe9XMZJU14etAmB7NB dubMPiFWkhGKHRAhyRYH1JZtXcVNww5VjePPYAjAoY/A9o/MMmydeQkY2o9e/smc5etI WNcsFpA7h/jRuyaPpN8wS9k6J68BMeZS0fAZWceV66GHdxaF2Bj9/sYPW7WodA5dxnQ3 h/TZO0GI5qEO4l+5TJilWj3DI6B0EbXAF5/YQAogYPX69u9ZZKbtBc3FXW5Ik4hSyQrb Zq/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=BtbW6QyvvjbtsX2GzOtawuRqByUjnvO+J6lUReNjPdw=; b=cIr/qgvV+oFNK4qR3CjbTTolh13X9WIIXlgxVZ60418ATwE38thfu/nj7ZWmkh5xj0 xM8YPsdDUPg8sT2aMTR6PJ75e3TJa85lKJi2v3po7/k8pHcZjFtHdBivuRq44IJxQITu jE4NReSfK3otfkf5VkzLQwCiTiyJXrBD6sHmPmuqAUev6O/QDMmAo7Hd8nO5GzjlE9ZT 61751rT3/LngXu1qs9n7ddWY8G4KjJlMsEeRPjoKq/HBEoROmjCQfqY+BgXr29WS0KmO oNyFMthvQ1JCHvMTmE2V+xrIRawaagtOZzXkuR+9UaV5kuCf+046SazGxoEga8v4nL64 Thjg== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c16-20020a056a00249000b006281f2d375dsi3384562pfv.132.2023.03.22.11.45.08; Wed, 22 Mar 2023 11:45:20 -0700 (PDT) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230419AbjCVSnw (ORCPT + 99 others); Wed, 22 Mar 2023 14:43:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230022AbjCVSnj (ORCPT ); Wed, 22 Mar 2023 14:43:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6FA9298D6 for ; Wed, 22 Mar 2023 11:43:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 64C8B6227E for ; Wed, 22 Mar 2023 18:43:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CF96C433A1; Wed, 22 Mar 2023 18:43:36 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pf3Qt-000paE-14; Wed, 22 Mar 2023 14:43:35 -0400 Message-ID: <20230322184335.149101791@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 22 Mar 2023 14:42:47 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Uros Bizjak , Mukesh Ojha Subject: [for-next][PATCH 08/11] ring_buffer: Change some static functions to void References: <20230322184239.594953818@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761094633788195573?= X-GMAIL-MSGID: =?utf-8?q?1761094633788195573?= From: Uros Bizjak The results of some static functions are not used. Change the type of these function to void and remove unnecessary returns. No functional change intended. Link: https://lkml.kernel.org/r/20230305155532.5549-2-ubizjak@gmail.com Signed-off-by: Uros Bizjak Reviewed-by: Masami Hiramatsu Reviewed-by: Mukesh Ojha Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index c6f47b6cfd5f..b45915dd67b9 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1565,15 +1565,12 @@ static void rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer, } } -static int rb_check_bpage(struct ring_buffer_per_cpu *cpu_buffer, +static void rb_check_bpage(struct ring_buffer_per_cpu *cpu_buffer, struct buffer_page *bpage) { unsigned long val = (unsigned long)bpage; - if (RB_WARN_ON(cpu_buffer, val & RB_FLAG_MASK)) - return 1; - - return 0; + RB_WARN_ON(cpu_buffer, val & RB_FLAG_MASK); } /** @@ -1583,30 +1580,28 @@ static int rb_check_bpage(struct ring_buffer_per_cpu *cpu_buffer, * As a safety measure we check to make sure the data pages have not * been corrupted. */ -static int rb_check_pages(struct ring_buffer_per_cpu *cpu_buffer) +static void rb_check_pages(struct ring_buffer_per_cpu *cpu_buffer) { struct list_head *head = rb_list_head(cpu_buffer->pages); struct list_head *tmp; if (RB_WARN_ON(cpu_buffer, rb_list_head(rb_list_head(head->next)->prev) != head)) - return -1; + return; if (RB_WARN_ON(cpu_buffer, rb_list_head(rb_list_head(head->prev)->next) != head)) - return -1; + return; for (tmp = rb_list_head(head->next); tmp != head; tmp = rb_list_head(tmp->next)) { if (RB_WARN_ON(cpu_buffer, rb_list_head(rb_list_head(tmp->next)->prev) != tmp)) - return -1; + return; if (RB_WARN_ON(cpu_buffer, rb_list_head(rb_list_head(tmp->prev)->next) != tmp)) - return -1; + return; } - - return 0; } static int __rb_allocate_pages(struct ring_buffer_per_cpu *cpu_buffer, @@ -4496,7 +4491,6 @@ rb_update_read_stamp(struct ring_buffer_per_cpu *cpu_buffer, default: RB_WARN_ON(cpu_buffer, 1); } - return; } static void @@ -4527,7 +4521,6 @@ rb_update_iter_read_stamp(struct ring_buffer_iter *iter, default: RB_WARN_ON(iter->cpu_buffer, 1); } - return; } static struct buffer_page * @@ -4942,7 +4935,6 @@ rb_reader_unlock(struct ring_buffer_per_cpu *cpu_buffer, bool locked) { if (likely(locked)) raw_spin_unlock(&cpu_buffer->reader_lock); - return; } /**