From patchwork Sun Jul 16 17:40:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mason X-Patchwork-Id: 9843557 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2C3126037F for ; Sun, 16 Jul 2017 17:40:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00E0528469 for ; Sun, 16 Jul 2017 17:40:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E9E6128514; Sun, 16 Jul 2017 17:40:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7397328469 for ; Sun, 16 Jul 2017 17:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Date:Message-ID:Subject: From:To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ZOnEIUohzOybsfZb2pSMdipVY2BOyBjBSa3Zdolhyl8=; b=qS4uRJTFsPaNtZ qnOVd82kS+5c5uH11GaDxpaRE8bmSbscJPqoCh+5vf0erp9nXdAWfvKwg+ws3QC09XezeW+Zs13YX s2zBuj424ELCVUodRnpA9Pn5OCT9ujdUScAzHdfHJux5Pr8MAn8L7ZnK+10N8BwbVGz6q7yvrSb4+ qtRdvPIzYCCNmS6+Ddzio6gwFqwW+phTkVo4D5J+IsMkhj8U7s/Xq0GNRkvQ/8wfr2nWuLwu0u9fA PkwTfJ4zZVIVNiDXw2SOjI4UesgjVrI8zpRq4bc8LMah7YBNpToeontl4L3Tfnl3drSc73gsf6YoB 8ra23Hm5ujfJWNAG4jxA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dWnXB-00063f-3H; Sun, 16 Jul 2017 17:40:45 +0000 Received: from smtp2-g21.free.fr ([212.27.42.2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dWnX7-0005vX-BN for linux-arm-kernel@lists.infradead.org; Sun, 16 Jul 2017 17:40:43 +0000 Received: from [192.168.0.66] (unknown [88.191.210.51]) (Authenticated sender: shill) by smtp2-g21.free.fr (Postfix) with ESMTPSA id A2BE220039E; Sun, 16 Jul 2017 19:40:06 +0200 (CEST) To: Marc Zyngier , Thomas Gleixner From: Mason Subject: [PATCH] irqchip/gic: Use GIC_SPI symbolic constant Message-ID: Date: Sun, 16 Jul 2017 19:40:06 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:52.0) Gecko/20100101 Firefox/52.0 SeaMonkey/2.49.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170716_104041_591524_6DC77948 X-CRM114-Status: UNSURE ( 7.86 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Linux ARM Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use GIC_SPI explicitly instead of an implicit 0. Signed-off-by: Mason --- FWIW, 'make C=2' flagged a few lines: $ make C=2 drivers/irqchip/irq-gic.o CHECK drivers/irqchip/irq-gic.c drivers/irqchip/irq-gic.c:1079:44: warning: incorrect type in assignment (different address spaces) drivers/irqchip/irq-gic.c:1079:44: expected void [noderef] *[noderef] *percpu_base drivers/irqchip/irq-gic.c:1079:44: got void [noderef] *[noderef] * drivers/irqchip/irq-gic.c:1080:43: warning: incorrect type in assignment (different address spaces) drivers/irqchip/irq-gic.c:1080:43: expected void [noderef] *[noderef] *percpu_base drivers/irqchip/irq-gic.c:1080:43: got void [noderef] *[noderef] * drivers/irqchip/irq-gic.c:1091:26: warning: incorrect type in initializer (different address spaces) drivers/irqchip/irq-gic.c:1091:26: expected void const [noderef] *__vpp_verify drivers/irqchip/irq-gic.c:1091:26: got void [noderef] *[noderef] * drivers/irqchip/irq-gic.c:1091:71: warning: incorrect type in assignment (different address spaces) drivers/irqchip/irq-gic.c:1091:71: expected void [noderef] * drivers/irqchip/irq-gic.c:1091:71: got void [noderef] * drivers/irqchip/irq-gic.c:1093:26: warning: incorrect type in initializer (different address spaces) drivers/irqchip/irq-gic.c:1093:26: expected void const [noderef] *__vpp_verify drivers/irqchip/irq-gic.c:1093:26: got void [noderef] *[noderef] * drivers/irqchip/irq-gic.c:1093:70: warning: incorrect type in assignment (different address spaces) drivers/irqchip/irq-gic.c:1093:70: expected void [noderef] * drivers/irqchip/irq-gic.c:1093:70: got void [noderef] * drivers/irqchip/irq-gic.c:1167:43: warning: incorrect type in argument 1 (different address spaces) drivers/irqchip/irq-gic.c:1167:43: expected void [noderef] *__pdata drivers/irqchip/irq-gic.c:1167:43: got void [noderef] *[noderef] *percpu_base drivers/irqchip/irq-gic.c:1168:42: warning: incorrect type in argument 1 (different address spaces) drivers/irqchip/irq-gic.c:1168:42: expected void [noderef] *__pdata drivers/irqchip/irq-gic.c:1168:42: got void [noderef] *[noderef] *percpu_base --- drivers/irqchip/irq-gic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 1b1df4f770bd..ae414f5223b6 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -42,6 +42,8 @@ #include #include +#include + #include #include #include @@ -990,7 +992,7 @@ static int gic_irq_domain_translate(struct irq_domain *d, * For SPIs, we need to add 16 more to get the GIC irq * ID number */ - if (!fwspec->param[0]) + if (fwspec->param[0] == GIC_SPI) *hwirq += 16; *type = fwspec->param[2] & IRQ_TYPE_SENSE_MASK;