The following commit has been merged into the irq/core branch of tip:
Commit-ID: be5e5f3a1120bada0cff1bc84c2a1805da308f6e
Gitweb: https://git.kernel.org/tip/be5e5f3a1120bada0cff1bc84c2a1805da308f6e
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Tue, 25 Jun 2024 21:30:48 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Tue, 25 Jun 2024 21:30:48 +02:00
Revert "irqchip/dw-apb-ictl: Support building as module"
This reverts commit 7cc4f309c933ec5d64eea31066fe86bbf9e48819.
Causes build fails.
Reported-by: Mark Brown <broonie@xxxxxxxxxx>
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Jisheng Zhang <jszhang@xxxxxxxxxx>
https://lore.kernel.org/oe-kbuild-all/202406250214.WZEjWnnU-lkp@xxxxxxxxx/
---
drivers/irqchip/Kconfig | 2 +-
drivers/irqchip/irq-dw-apb-ictl.c | 13 +++----------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index cbf49b6..344c484 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -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
diff --git a/drivers/irqchip/irq-dw-apb-ictl.c b/drivers/irqchip/irq-dw-apb-ictl.c
index 5eda6c4..d5c1c75 100644
--- a/drivers/irqchip/irq-dw-apb-ictl.c
+++ b/drivers/irqchip/irq-dw-apb-ictl.c
@@ -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 @@ err_release:
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);
|