Skip to content

Commit

Permalink
Revert "irqchip/dw-apb-ictl: Support building as module"
Browse files Browse the repository at this point in the history
This reverts commit 7cc4f30.

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/
  • Loading branch information
Thomas Gleixner committed Jun 25, 2024
1 parent 18db1b6 commit be5e5f3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion drivers/irqchip/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 3 additions & 10 deletions drivers/irqchip/irq-dw-apb-ictl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

0 comments on commit be5e5f3

Please sign in to comment.