Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3333701ybl; Mon, 20 Jan 2020 21:55:43 -0800 (PST) X-Google-Smtp-Source: APXvYqyU3byEZOKiAmzNHcL63YHkEpz5JtBZl6lQ55qD5vTGPdPybc6gnmQABdMIXARNJE4EGLL2 X-Received: by 2002:aca:d887:: with SMTP id p129mr1781253oig.51.1579586142862; Mon, 20 Jan 2020 21:55:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579586142; cv=none; d=google.com; s=arc-20160816; b=qtls1pTZMLI4wofmwtqQgyWox96h6Q2VFgJLHglw+33yzrCaTeGcqaEzB0trsg5125 Kv7TK9/EtjsmXgtcrTq/073pr8LlvboaX4Xx19zxA/mByAh7nH/IQYXPI7R+tP8TS6lf F42sXrmQd024zIob4AkpLMpfAVLn/paH2FYKwVJzjb11OcQjuUfvt4F/3iqt3qdB25JI JUniA86XyP0bME6FTnkR1QHWxK8Ilt4rxJfoEqIM/7KNdQ0jGVAyn2looDQzF85ASTQ5 ECTCkirESaWC6xFjGkn5merHWtMnTle6z6DImS5zNZXjSZsUAztmkqdg75C1Cto3oozt Bxqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:message-id:date:subject:cc:from; bh=GMF4nB9e5kjD0yQZVuLOtqR60IU5l/BRy3CSJYPeMtE=; b=tuvOSdTRKMPag+A/qn81YPFrdbi4+yZh6zVMiNOwxTXiNtE2ccRqB1eJH7+4k7eVVP 8Wa11B7bkNIRC+tQeZkHEfhLMBoe6xzMWk0n+2A9yHLu8SkAnx5tbtk6+vOdZM+vbnQ/ ao1D8F9C+OYJvJplvZfEytGlaD3k2dA8gB5NoLJ5FLuA+8BDjwSjlabz97r8yFak8RvU bdqH0nE0TByvez7VEf2maqK7oIWLrR1i+qiurxO10YsQSgrcEe8JXbyamiQaeeMo7d9R 7a0xWS2XWvx3quaILPVRGg+1apw3uUugTuhnEVNiiQ2cbJ1+xnaC5Xl0Rtren+1cydL3 IS1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b24si21413033otf.34.2020.01.20.21.55.31; Mon, 20 Jan 2020 21:55:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728827AbgAUFyg (ORCPT + 99 others); Tue, 21 Jan 2020 00:54:36 -0500 Received: from out30-45.freemail.mail.aliyun.com ([115.124.30.45]:49308 "EHLO out30-45.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725916AbgAUFyf (ORCPT ); Tue, 21 Jan 2020 00:54:35 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R751e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e07484;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=3;SR=0;TI=SMTPD_---0ToH3qle_1579586073; Received: from localhost(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0ToH3qle_1579586073) by smtp.aliyun-inc.com(127.0.0.1); Tue, 21 Jan 2020 13:54:33 +0800 From: Alex Shi Cc: Steven Rostedt , Ingo Molnar , linux-kernel@vger.kernel.org Subject: [PATCH] ftrace: remove unused variables Date: Tue, 21 Jan 2020 13:54:32 +0800 Message-Id: <1579586072-45047-1-git-send-email-alex.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No body care 'ret' in their functions. So better to remove them. Signed-off-by: Alex Shi Cc: Steven Rostedt Cc: Ingo Molnar Cc: linux-kernel@vger.kernel.org --- kernel/trace/ftrace.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 9bf1f2cd515e..3826bad33c87 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -4113,7 +4113,6 @@ static void process_mod_list(struct list_head *head, struct ftrace_ops *ops, struct ftrace_hash **orig_hash, *new_hash; LIST_HEAD(process_mods); char *func; - int ret; mutex_lock(&ops->func_hash->regex_lock); @@ -4166,7 +4165,7 @@ static void process_mod_list(struct list_head *head, struct ftrace_ops *ops, mutex_lock(&ftrace_lock); - ret = ftrace_hash_move_and_update_ops(ops, orig_hash, + ftrace_hash_move_and_update_ops(ops, orig_hash, new_hash, enable); mutex_unlock(&ftrace_lock); @@ -5517,7 +5516,6 @@ int ftrace_regex_release(struct inode *inode, struct file *file) struct ftrace_hash **orig_hash; struct trace_parser *parser; int filter_hash; - int ret; if (file->f_mode & FMODE_READ) { iter = m->private; @@ -5545,7 +5543,7 @@ int ftrace_regex_release(struct inode *inode, struct file *file) orig_hash = &iter->ops->func_hash->notrace_hash; mutex_lock(&ftrace_lock); - ret = ftrace_hash_move_and_update_ops(iter->ops, orig_hash, + ftrace_hash_move_and_update_ops(iter->ops, orig_hash, iter->hash, filter_hash); mutex_unlock(&ftrace_lock); } else { -- 1.8.3.1