Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 7cc4f309c9.

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/
This commit is contained in:
Thomas Gleixner 2024-06-25 21:30:48 +02:00
parent 18db1b6dbb
commit be5e5f3a11
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/irqchip/Kconfig
View File

@ -145,7 +145,7 @@ config DAVINCI_CP_INTC
select IRQ_DOMAIN select IRQ_DOMAIN
config DW_APB_ICTL config DW_APB_ICTL
tristate "DesignWare APB Interrupt Controller" bool
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select IRQ_DOMAIN_HIERARCHY select IRQ_DOMAIN_HIERARCHY

13
drivers/irqchip/irq-dw-apb-ictl.c
View File

@ -122,7 +122,7 @@ static int __init dw_apb_ictl_init(struct device_node *np,
int ret, nrirqs, parent_irq, i; int ret, nrirqs, parent_irq, i;
u32 reg; u32 reg;
if (!parent && IS_BUILTIN(CONFIG_DW_APB_ICTL)) { if (!parent) {
/* Used as the primary interrupt controller */ /* Used as the primary interrupt controller */
parent_irq = 0; parent_irq = 0;
domain_ops = &dw_apb_ictl_irq_domain_ops; domain_ops = &dw_apb_ictl_irq_domain_ops;
@ -214,12 +214,5 @@ err_release:
release_mem_region(r.start, resource_size(&r)); release_mem_region(r.start, resource_size(&r));
return ret; return ret;
} }
#if IS_BUILTIN(CONFIG_DW_APB_ICTL) IRQCHIP_DECLARE(dw_apb_ictl,
IRQCHIP_DECLARE(dw_apb_ictl, "snps,dw-apb-ictl", dw_apb_ictl_init); "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