From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754234AbcIDSBO (ORCPT ); Sun, 4 Sep 2016 14:01:14 -0400 Received: from mout.web.de ([212.227.17.12]:64674 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753118AbcIDSBL (ORCPT ); Sun, 4 Sep 2016 14:01:11 -0400 Subject: [PATCH 3/4] perf/x86/cqm: One check and another variable less in intel_mbm_init() To: x86@kernel.org, Borislav Petkov , "H. Peter Anvin" , Ingo Molnar , Peter Zijlstra , Richard Cochran , Stephane Eranian , Thomas Gleixner , Tony Luck , Vikas Shivappa References: <566ABCD9.1060404@users.sourceforge.net> <9d893198-dd12-14a8-74bd-02fc42de4bf4@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Paolo Bonzini From: SF Markus Elfring Message-ID: <239ce590-bda1-1276-9723-5e7fee90d514@users.sourceforge.net> Date: Sun, 4 Sep 2016 19:58:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <9d893198-dd12-14a8-74bd-02fc42de4bf4@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:SMhfyWUk/XAsiLW98PpL4bo3RXH8Hii1Hv0NT0AODIipOCkgI01 MH1uzrjXlz84bNxSRMGF/w/Vrwuwn6+woWi+tBcU+3k5vpcjY8MKV1GwOfGpQIV2muqlt8/ wvi2X7Ke2Yvgz4JrhuU08D26VynvJoWf0GjGyWU9GrknG+6lT9bgVopeuSoSgxay+U4dauD fG7S0ulvfuywMJx4DZAhQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:4rwd2dyK1l0=:L+r8GpxLvZy1Aiu9SFdPW1 dOK288/eROuEvnsWBFwK9EKWx0k+W6bOJ3mqXTQbCV5lCV4Qpnwhr16yRVNHtXBsB3dxJr7qy 3d1CgKI5KcpVLEnNesG9wD24GujE14TPW7gIEgbAJuXpZ19UDqxt55Rm3sIg8OI8EO+D4eSB3 aZ3FWTvwnU7sNiHKdt0h/GKg9oB7v3ENvsfyC6zDcVPRPuWYi1DCtDBx7UGt5Aa2fK9Qmnl70 yXIPFv8bDfT24lWI6wM34xR828D0zO0ZLXqYG+wRwyHdWpKPG3ilK8Bbl+H3CKH1yy9HKIjMW UdE/iH/2hJ0uQ90FQxjVEo5leQjByHZTgST2WINS47iK1aKf6ebgkHlzDflovHKJ4eOsPk++D NZdlp74nkD4euDOHWMOI53/zUNO4GxA6XXDLtHDEk92JWG30H4YZ72TG8URemNBSOhJlNa1lv 5fJ1FjvjX7n6PddFl4H0An6eaYymF1EVNQ58V+af3qfEdi4xmfx3opsDhFy7uSmvG5H8Ul9xI PA7lj6KOlExn+oc1mLNkiYKBOdPXecfAWStpx7QUUohM4OahhWdOZu7yNRiQdL01xDmSvNDrU aLU8c8qw6g8LxsAzVn8UH/Uj7ibl0C9M1+3Bn7l+ewoMmjm4CXyZ5v6+3oRpLdqcf2bubhBEl bufAezf6KqZzQLuY7GrkUBJnpoq1X6pTqTgQClDBNV0FCGUt3JAlnQBIURSL9tYLxFC08EolW 94G7s6yZQu+x5b9cAuPPVmngW7JrnPx/VPtnfUePHcGwmy7IloOVzylQA7vKCl+PT5irvTcCs bnyq2b3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 4 Sep 2016 19:06:33 +0200 1. Adjust a jump target to eliminate an extra check at the end. 2. Move a jump label according to the current Linux coding style convention. 3. Return only constant values for the success or failure indication. 4. Delete the local variable "ret" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- arch/x86/events/intel/cqm.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/arch/x86/events/intel/cqm.c b/arch/x86/events/intel/cqm.c index 29f756e..304caf53 100644 --- a/arch/x86/events/intel/cqm.c +++ b/arch/x86/events/intel/cqm.c @@ -1637,7 +1637,7 @@ static const struct x86_cpu_id intel_mbm_total_match[] = { static int intel_mbm_init(void) { - int ret = 0, maxid = cqm_max_rmid + 1; + int const maxid = cqm_max_rmid + 1; mbm_socket_max = topology_max_packages(); mbm_local = kmalloc_array(maxid * mbm_socket_max, @@ -1649,25 +1649,20 @@ static int intel_mbm_init(void) mbm_total = kmalloc_array(maxid * mbm_socket_max, sizeof(*mbm_total), GFP_KERNEL); - if (!mbm_total) { - ret = -ENOMEM; - goto out; - } + if (!mbm_total) + goto free_mbm; mbm_timers = kmalloc_array(mbm_socket_max, sizeof(*mbm_timers), GFP_KERNEL); - if (!mbm_timers) { - ret = -ENOMEM; - goto out; - } - mbm_hrtimer_init(); + if (!mbm_timers) + goto free_mbm; -out: - if (ret) - mbm_cleanup(); - - return ret; + mbm_hrtimer_init(); + return 0; + free_mbm: + mbm_cleanup(); + return -ENOMEM; } static int __init intel_cqm_init(void) -- 2.9.3