From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755768AbcHXJ03 (ORCPT ); Wed, 24 Aug 2016 05:26:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44228 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754285AbcHXJ0S (ORCPT ); Wed, 24 Aug 2016 05:26:18 -0400 Date: Wed, 24 Aug 2016 02:24:55 -0700 From: tip-bot for Colin Ian King Message-ID: Cc: jolsa@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, alexander.shishkin@linux.intel.com, tglx@linutronix.de, hpa@zytor.com, colin.king@canonical.com, penberg@kernel.org, wangnan0@huawei.com, acme@redhat.com, peterz@infradead.org, namhyung@kernel.org Reply-To: peterz@infradead.org, namhyung@kernel.org, colin.king@canonical.com, hpa@zytor.com, wangnan0@huawei.com, acme@redhat.com, penberg@kernel.org, alexander.shishkin@linux.intel.com, tglx@linutronix.de, jolsa@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1471278343-14999-1-git-send-email-colin.king@canonical.com> References: <1471278343-14999-1-git-send-email-colin.king@canonical.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists browser: Remove superfluous null check on map Git-Commit-ID: 6637e6f1ac62e62a353612844db21cff9a17758b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6637e6f1ac62e62a353612844db21cff9a17758b Gitweb: http://git.kernel.org/tip/6637e6f1ac62e62a353612844db21cff9a17758b Author: Colin Ian King AuthorDate: Mon, 15 Aug 2016 17:25:43 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 23 Aug 2016 15:37:33 -0300 perf hists browser: Remove superfluous null check on map 'map' is being already checked if it is NULL at the start of do_zoom_dso(), so the second subsequent check is superfluous and can be removed. Signed-off-by: Colin King Acked-by: Namhyung Kim Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Pekka Enberg Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1471278343-14999-1-git-send-email-colin.king@canonical.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 22e48a3..f0611c9 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -2440,8 +2440,6 @@ do_zoom_dso(struct hist_browser *browser, struct popup_action *act) browser->hists->dso_filter = NULL; ui_helpline__pop(); } else { - if (map == NULL) - return 0; ui_helpline__fpush("To zoom out press ESC or ENTER + \"Zoom out of %s DSO\"", __map__is_kernel(map) ? "the Kernel" : map->dso->short_name); browser->hists->dso_filter = map->dso;