From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754045AbcHZSPr (ORCPT ); Fri, 26 Aug 2016 14:15:47 -0400 Received: from mout.web.de ([217.72.192.78]:52805 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751449AbcHZSPj (ORCPT ); Fri, 26 Aug 2016 14:15:39 -0400 Subject: [PATCH 2/5] IA64-IRQ: Delete unnecessary braces To: linux-ia64@vger.kernel.org, Fenghua Yu , Tony Luck References: <349bbfb4-bada-628e-2981-ca2a315299fc@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Paolo Bonzini From: SF Markus Elfring Message-ID: Date: Fri, 26 Aug 2016 20:03:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <349bbfb4-bada-628e-2981-ca2a315299fc@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:FxfKnR3TNilOEXk7RyMJyasK10GbKmZ49GQkZzogB0e2HGRFrKx ymzcY5sFQkhWrCl+hxeYPgIl8AUuIsZsDoUCrQT9efT0Bt9mNMioKZRsE+1t5uUhs04E7xr 0ulrWuZENBfIpPXScIPyZ/aiX567lFFoh1zIRtT5CDcekCRyMwt5FxErcZuRoUnhT+rHkWv 3LcaubybrMnBgVhFI6EyA== X-UI-Out-Filterresults: notjunk:1;V01:K0:DJgcfvQHca0=:Dy+RfbWXTuf6A/YhiysBeX u3ZPwdoNqLure+Cjrf//SJ+ov5cpaP8tseXg3j06FfaieEQsp1aymsWIYds4tal7pUO+Ao6At bMdd2W/OmjZu2q2jTHr+fqAgXzy+jmiYXHs2PxvHJBrsuhyfEpP799b5j34bDzJQrMTgjZrVE 1zQ0XT954nW8RleJYwI6XeBAyZ1BDV5By10W3UHLqlqZxqIx2bDpY5XplQZFHlHgkIF3f2TB5 QuJk/Rw1FGnHp8Vc4ezaeupRevUKqe+2hOBO78koXhzpJmWXGXQ9Fv3mcOzzjONAkLhK0TvT5 YYuj/Hmk6/0sEIO0jNUDqaCLpm5PclADH/guWpuDTLtXdqOGQpdsiGVi92SjIH93EdbQxodZc G/chAluNdG35LaSZPH3G1686RTnZo6H92vtm+Sz7XKLWAZnTe3CTFHxVPUACh+ukLQTZJi+ok dCYrs22hiBlFbxduIy342VTHlAIbT0E1wlYwFFpOs/vbaCepK/II0/0D39oZOST/FtE/CmEK4 xYw5nnHGCfpf7i1oVc/ocWXydKt5TbpITWVwnWx5Dtfckp9wPaSBPbJP4HY0fnYE831jCxPWO OY7NtQd0v8rs9cXZ0KCpeXo4zFkSWs6gtIO0U4+EEHasYZn7gqLYSvanVWyW9V7pDkS9yvG2r ISYLCd+/SU0w83GSJFo6D8icjHnv8Ke9sgg9pphsvFkKM7qCzoN2Ty3S9Bc8ZsvP7oeGwhw48 i2c/l5G+66cgKeH8L21Pqd2LVicAP7IDKnjgy49hc56KPoQNPNhEhwMcgTnOqf7CvrGDq8w6J Icx0Rn+ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 26 Aug 2016 18:40:16 +0200 Do not use curly brackets at a few source code places where a single statement should be sufficient. Signed-off-by: Markus Elfring --- arch/ia64/sn/kernel/irq.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index c7f9eea..9862a97 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c @@ -127,9 +127,8 @@ struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info, struct sn_pcibus_provider *pci_provider; bridge = (u64) sn_irq_info->irq_bridge; - if (!bridge) { + if (!bridge) return NULL; /* irq is not a device interrupt */ - } local_nasid = NASID_GET(bridge); @@ -274,10 +273,9 @@ void sn_irq_init(void) ia64_first_device_vector = IA64_SN2_FIRST_DEVICE_VECTOR; ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR; - for (i = 0; i < NR_IRQS; i++) { + for (i = 0; i < NR_IRQS; i++) if (irq_get_chip(i) == &no_irq_chip) irq_set_chip(i, &irq_type_sn); - } } static void register_intr_pda(struct sn_irq_info *sn_irq_info) @@ -285,10 +283,8 @@ static void register_intr_pda(struct sn_irq_info *sn_irq_info) int irq = sn_irq_info->irq_irq; int cpu = sn_irq_info->irq_cpuid; - if (pdacpu(cpu)->sn_last_irq < irq) { + if (pdacpu(cpu)->sn_last_irq < irq) pdacpu(cpu)->sn_last_irq = irq; - } - if (pdacpu(cpu)->sn_first_irq == 0 || pdacpu(cpu)->sn_first_irq > irq) pdacpu(cpu)->sn_first_irq = irq; } @@ -304,15 +300,15 @@ static void unregister_intr_pda(struct sn_irq_info *sn_irq_info) if (pdacpu(cpu)->sn_last_irq == irq) { foundmatch = 0; for (i = pdacpu(cpu)->sn_last_irq - 1; - i && !foundmatch; i--) { + i && !foundmatch; + i--) list_for_each_entry_rcu(tmp_irq_info, sn_irq_lh[i], - list) { + list) if (tmp_irq_info->irq_cpuid == cpu) { foundmatch = 1; break; } - } } pdacpu(cpu)->sn_last_irq = i; } @@ -440,7 +436,7 @@ static void sn_check_intr(int irq, struct sn_irq_info *sn_irq_info) pdi_pcibus_info; regval = pcireg_intr_status_get(pcibus_info); - if (!ia64_get_irr(irq_to_vector(irq))) { + if (!ia64_get_irr(irq_to_vector(irq))) if (!test_bit(irq, pda->sn_in_service_ivecs)) { regval &= 0xff; if (sn_irq_info->irq_int_bit & regval & @@ -449,7 +445,6 @@ static void sn_check_intr(int irq, struct sn_irq_info *sn_irq_info) sn_call_force_intr_provider(sn_irq_info); } } - } sn_irq_info->irq_last_intr = regval; } @@ -462,11 +457,9 @@ void sn_lb_int_war_check(void) return; rcu_read_lock(); - for (i = pda->sn_first_irq; i <= pda->sn_last_irq; i++) { - list_for_each_entry_rcu(sn_irq_info, sn_irq_lh[i], list) { + for (i = pda->sn_first_irq; i <= pda->sn_last_irq; i++) + list_for_each_entry_rcu(sn_irq_info, sn_irq_lh[i], list) sn_check_intr(i, sn_irq_info); - } - } rcu_read_unlock(); } -- 2.9.3