Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934228AbbGHSLb (ORCPT ); Wed, 8 Jul 2015 14:11:31 -0400 Received: from smtp4-g21.free.fr ([212.27.42.4]:46805 "EHLO smtp4-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932310AbbGHSL3 (ORCPT ); Wed, 8 Jul 2015 14:11:29 -0400 From: Alban Bedel To: linux-mips@linux-mips.org Cc: Thomas Gleixner , Ralf Baechle , Andrew Bresticker , Qais Yousef , linux-kernel@vger.kernel.org, Alban Bedel Subject: [PATCH] MIPS: ath79: irq: Remove the include of drivers/irqchip/irqchip.h Date: Wed, 8 Jul 2015 20:11:11 +0200 Message-Id: <1436379071-31574-1-git-send-email-albeu@free.fr> X-Mailer: git-send-email 2.0.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1640 Lines: 48 We shouldn't include irqchip.h from outside of the drivers/irqchip directory. The irq driver should idealy be there, however this not trivial at the moment. We still need to support platforms without DT support and the interface to the DDR controller still use a custom arch specific API. For now just redefine the IRQCHIP_DECLARE macro to avoid the cross tree include. Signed-off-by: Alban Bedel --- arch/mips/ath79/irq.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/mips/ath79/irq.c b/arch/mips/ath79/irq.c index afb0096..c5ad737 100644 --- a/arch/mips/ath79/irq.c +++ b/arch/mips/ath79/irq.c @@ -17,7 +17,6 @@ #include #include #include -#include "../../../drivers/irqchip/irqchip.h" #include #include @@ -272,6 +271,13 @@ asmlinkage void plat_irq_dispatch(void) } #ifdef CONFIG_IRQCHIP +/* + * We cannot use the IRQCHIP_DECLARE macro that lives in + * drivers/irqchip, so we're forced to roll our own. Not very nice, + * but should do until this code is moved to drivers/irqchip. + */ +#define IRQCHIP_DECLARE(name, compat, fn) OF_DECLARE_2(irqchip, name, compat, fn) + static int misc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw) { irq_set_chip_and_handler(irq, &ath79_misc_irq_chip, handle_level_irq); -- 2.0.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/