Commit be5e5f3a authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Revert "irqchip/dw-apb-ictl: Support building as module" 



This reverts commit 7cc4f309.

Causes build fails.

Reported-by: default avatarMark Brown <broonie@kernel.org>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Jisheng Zhang <jszhang@kernel.org>
https://lore.kernel.org/oe-kbuild-all/202406250214.WZEjWnnU-lkp@intel.com/
parent 18db1b6d

drivers/irqchip/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ config DAVINCI_CP_INTC 
	select IRQ_DOMAIN



config DW_APB_ICTL

	tristate "DesignWare APB Interrupt Controller"

	bool

	select GENERIC_IRQ_CHIP

	select IRQ_DOMAIN_HIERARCHY

drivers/irqchip/irq-dw-apb-ictl.c

+3 −10
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int __init dw_apb_ictl_init(struct device_node *np, 
	int ret, nrirqs, parent_irq, i;

	u32 reg;



	if (!parent && IS_BUILTIN(CONFIG_DW_APB_ICTL)) {

	if (!parent) {

		/* Used as the primary interrupt controller */

		parent_irq = 0;

		domain_ops = &dw_apb_ictl_irq_domain_ops;
@@ -214,12 +214,5 @@ static int __init dw_apb_ictl_init(struct device_node *np, 
	release_mem_region(r.start, resource_size(&r));

	return ret;

}

#if IS_BUILTIN(CONFIG_DW_APB_ICTL)

IRQCHIP_DECLARE(dw_apb_ictl, "snps,dw-apb-ictl", dw_apb_ictl_init);

#else

IRQCHIP_PLATFORM_DRIVER_BEGIN(dw_apb_ictl)

IRQCHIP_MATCH("snps,dw-apb-ictl", dw_apb_ictl_init)

IRQCHIP_PLATFORM_DRIVER_END(dw_apb_ictl)

MODULE_DESCRIPTION("DesignWare APB Interrupt Controller");

MODULE_LICENSE("GPL v2");

#endif
 
IRQCHIP_DECLARE(dw_apb_ictl,

		"snps,dw-apb-ictl", dw_apb_ictl_init);