Skip to content

Commit be5e5f3

Browse files
committed
Revert "irqchip/dw-apb-ictl: Support building as module"
This reverts commit 7cc4f30. Causes build fails. Reported-by: Mark Brown <[email protected]> Reported-by: kernel test robot <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: Jisheng Zhang <[email protected]> https://lore.kernel.org/oe-kbuild-all/[email protected]/
1 parent 18db1b6 commit be5e5f3

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

drivers/irqchip/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ config DAVINCI_CP_INTC
145145
select IRQ_DOMAIN
146146

147147
config DW_APB_ICTL
148-
tristate "DesignWare APB Interrupt Controller"
148+
bool
149149
select GENERIC_IRQ_CHIP
150150
select IRQ_DOMAIN_HIERARCHY
151151

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static int __init dw_apb_ictl_init(struct device_node *np,
122122
int ret, nrirqs, parent_irq, i;
123123
u32 reg;
124124

125-
if (!parent && IS_BUILTIN(CONFIG_DW_APB_ICTL)) {
125+
if (!parent) {
126126
/* Used as the primary interrupt controller */
127127
parent_irq = 0;
128128
domain_ops = &dw_apb_ictl_irq_domain_ops;
@@ -214,12 +214,5 @@ static int __init dw_apb_ictl_init(struct device_node *np,
214214
release_mem_region(r.start, resource_size(&r));
215215
return ret;
216216
}
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);

0 commit comments

Comments
 (0)