From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752130AbbDAG4q (ORCPT ); Wed, 1 Apr 2015 02:56:46 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:7783 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751097AbbDAG4p (ORCPT ); Wed, 1 Apr 2015 02:56:45 -0400 From: Zhen Lei To: Thomas Gleixner , Jason Cooper , Marc Zyngier , linux-kernel CC: Zefan Li , Xinwei Hu , "Tianhong Ding" , Kefeng Wang , Zhen Lei Subject: [PATCH 1/1] irqchip/gicv3: remove duplicated parameter testing Date: Wed, 1 Apr 2015 14:54:58 +0800 Message-ID: <1427871298-11976-1-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.8.4.msysgit.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.177.27.142] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Test hardware irq number from small to large, and add a blank above each comment. To make it more clear. Signed-off-by: Zhen Lei --- drivers/irqchip/irq-gic-v3.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index fd8850d..f43cfa1 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -611,12 +611,6 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq, /* SGIs are private to the core kernel */ if (hw < 16) return -EPERM; - /* Nothing here */ - if (hw >= gic_data.irq_nr && hw < 8192) - return -EPERM; - /* Off limits */ - if (hw >= GIC_ID_NR) - return -EPERM; /* PPIs */ if (hw < 32) { @@ -624,13 +618,17 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq, irq_domain_set_info(d, irq, hw, &gic_chip, d->host_data, handle_percpu_devid_irq, NULL, NULL); set_irq_flags(irq, IRQF_VALID | IRQF_NOAUTOEN); + return 0; } + /* SPIs */ - if (hw >= 32 && hw < gic_data.irq_nr) { + if (hw < gic_data.irq_nr) { irq_domain_set_info(d, irq, hw, &gic_chip, d->host_data, handle_fasteoi_irq, NULL, NULL); set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); + return 0; } + /* LPIs */ if (hw >= 8192 && hw < GIC_ID_NR) { if (!gic_dist_supports_lpis()) @@ -638,9 +636,10 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq, irq_domain_set_info(d, irq, hw, &gic_chip, d->host_data, handle_fasteoi_irq, NULL, NULL); set_irq_flags(irq, IRQF_VALID); + return 0; } - return 0; + return -EPERM; } static int gic_irq_domain_xlate(struct irq_domain *d, -- 1.8.0