From 0cc09e85186082d414a89f85ec1b7ff588547f10 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Fri, 16 Oct 2015 15:21:10 +0100 Subject: ARM: Remove open-coded version of IRQCHIP_DECLARE Now that the IRQCHIP_DECLARE macro has been moved to linux/irqchip.h, it becomes possible to cleanup the open-coded versions of the same macro that have been added to some private irqchips implementations. Cc: Sascha Hauer Acked-by: Kukjin Kim Acked-by: Krzysztof Kozlowski Acked-by: Shawn Guo Acked-by: Tony Lindgren Signed-off-by: Marc Zyngier Signed-off-by: Olof Johansson --- arch/arm/mach-omap2/omap-wakeupgen.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'arch/arm/mach-omap2/omap-wakeupgen.c') diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index e1d2e991d17a..0f8c1d141968 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -537,9 +538,4 @@ static int __init wakeupgen_init(struct device_node *node, return 0; } - -/* - * We cannot use the IRQCHIP_DECLARE macro that lives in - * drivers/irqchip, so we're forced to roll our own. Not very nice. - */ -OF_DECLARE_2(irqchip, ti_wakeupgen, "ti,omap4-wugen-mpu", wakeupgen_init); +IRQCHIP_DECLARE(ti_wakeupgen, "ti,omap4-wugen-mpu", wakeupgen_init); -- cgit