Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

This reverts commit 7cc4f309c933ec5d64eea31066fe86bbf9e48819.

Causes build fails.

Reported-by: Mark Brown <broonie@kernel.org>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jisheng Zhang <jszhang@kernel.org>
https://lore.kernel.org/oe-kbuild-all/202406250214.WZEjWnnU-lkp@intel.com/

+4 -11
+1 -1
drivers/irqchip/Kconfig
··· 145 145 select IRQ_DOMAIN 146 146 147 147 config DW_APB_ICTL 148 - tristate "DesignWare APB Interrupt Controller" 148 + bool 149 149 select GENERIC_IRQ_CHIP 150 150 select IRQ_DOMAIN_HIERARCHY 151 151
+3 -10
drivers/irqchip/irq-dw-apb-ictl.c
··· 122 122 int ret, nrirqs, parent_irq, i; 123 123 u32 reg; 124 124 125 - if (!parent && IS_BUILTIN(CONFIG_DW_APB_ICTL)) { 125 + if (!parent) { 126 126 /* Used as the primary interrupt controller */ 127 127 parent_irq = 0; 128 128 domain_ops = &dw_apb_ictl_irq_domain_ops; ··· 214 214 release_mem_region(r.start, resource_size(&r)); 215 215 return ret; 216 216 } 217 - #if IS_BUILTIN(CONFIG_DW_APB_ICTL) 218 - IRQCHIP_DECLARE(dw_apb_ictl, "snps,dw-apb-ictl", dw_apb_ictl_init); 219 - #else 220 - IRQCHIP_PLATFORM_DRIVER_BEGIN(dw_apb_ictl) 221 - IRQCHIP_MATCH("snps,dw-apb-ictl", dw_apb_ictl_init) 222 - IRQCHIP_PLATFORM_DRIVER_END(dw_apb_ictl) 223 - MODULE_DESCRIPTION("DesignWare APB Interrupt Controller"); 224 - MODULE_LICENSE("GPL v2"); 225 - #endif 217 + IRQCHIP_DECLARE(dw_apb_ictl, 218 + "snps,dw-apb-ictl", dw_apb_ictl_init);