Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cc09e85 authored by Marc Zyngier's avatar Marc Zyngier Committed by Olof Johansson
Browse files

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 <kernel@pengutronix.de>
Acked-by: default avatarKukjin Kim <kgene@kernel.org>
Acked-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: default avatarShawn Guo <shawnguo@kernel.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 9aa2b26b

arch/arm/mach-exynos/suspend.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/cpu_pm.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/irqdomain.h>

#include <linux/of_address.h>

#include <linux/err.h>
@@ -262,7 +263,7 @@ static int __init exynos_pmu_irq_init(struct device_node *node, 
	return 0;

}



#define EXYNOS_PMU_IRQ(symbol, name)	OF_DECLARE_2(irqchip, symbol, name, exynos_pmu_irq_init)

#define EXYNOS_PMU_IRQ(symbol, name)	IRQCHIP_DECLARE(symbol, name, exynos_pmu_irq_init)



EXYNOS_PMU_IRQ(exynos3250_pmu_irq, "samsung,exynos3250-pmu");

EXYNOS_PMU_IRQ(exynos4210_pmu_irq, "samsung,exynos4210-pmu");

arch/arm/mach-imx/gpc.c

+2 −6
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/delay.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>
@@ -268,12 +269,7 @@ static int __init imx_gpc_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, imx_gpc, "fsl,imx6q-gpc", imx_gpc_init);

IRQCHIP_DECLARE(imx_gpc, "fsl,imx6q-gpc", imx_gpc_init);



void __init imx_gpc_check_dt(void)

{

arch/arm/mach-omap2/omap-wakeupgen.c

+2 −6
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/init.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/irqdomain.h>

#include <linux/of_address.h>

#include <linux/platform_device.h>
@@ -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);