The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 334f7d42db3eb0274aa6b4aba7ce14d87df3fef0
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/334f7d42db3eb0274aa6b4aba7ce14d87df3fef0
Author: Frank Li <Frank.Li@nxp.com>
AuthorDate: Thu, 22 Sep 2022 11:12:42 -05:00
Committer: Marc Zyngier <maz@kernel.org>
CommitterDate: Wed, 28 Sep 2022 14:21:53 +01:00
irqchip: Allow extra fields to be passed to IRQCHIP_PLATFORM_DRIVER_END
IRQCHIP_PLATFORM_DRIVER_* doesn't allow some fields (such as .pm)
to be set in the platform_driver structure.
Make IRQCHIP_PLATFORM_DRIVER_END variadic so that .pm or another
field can be set if needed.
Signed-off-by: Frank Li <Frank.Li@nxp.com>
[maz: revamped commit message]
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220922161246.20586-3-Frank.Li@nxp.com
---
include/linux/irqchip.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/linux/irqchip.h b/include/linux/irqchip.h
index 3a091d0..d5e6024 100644
--- a/include/linux/irqchip.h
+++ b/include/linux/irqchip.h
@@ -44,7 +44,8 @@ static const struct of_device_id drv_name##_irqchip_match_table[] = {
#define IRQCHIP_MATCH(compat, fn) { .compatible = compat, \
.data = typecheck_irq_init_cb(fn), },
-#define IRQCHIP_PLATFORM_DRIVER_END(drv_name) \
+
+#define IRQCHIP_PLATFORM_DRIVER_END(drv_name, ...) \
{}, \
}; \
MODULE_DEVICE_TABLE(of, drv_name##_irqchip_match_table); \
@@ -56,6 +57,7 @@ static struct platform_driver drv_name##_driver = { \
.owner = THIS_MODULE, \
.of_match_table = drv_name##_irqchip_match_table, \
.suppress_bind_attrs = true, \
+ __VA_ARGS__ \
}, \
}; \
builtin_platform_driver(drv_name##_driver)