diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-10-28 23:11:34 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-10-28 23:11:34 +0300 |
| commit | 11e45471abea1a69dc3a92b1d1632c4d628b3b98 (patch) | |
| tree | f9f69bf63094ad96f2a3d6d85d2c70bedd4928d3 /include/linux/irqchip.h | |
| parent | 5f5739d5f736614d555e8a2ec36dc4518dfa820c (diff) | |
| parent | 837d7a8fe852cf93fff1cd3b73d707b3a6ae340f (diff) | |
| download | linux-11e45471abea1a69dc3a92b1d1632c4d628b3b98.tar.xz | |
Merge branch irq/misc-5.16 into irq/irqchip-next
* irq/misc-5.16:
: .
: Misc irqchip fixes for 5.16:
: - MAINTAINERS update for the ARM VIC DT binding
: - Allow drivers using the IRQCHIP_PLATFORM_DRIVER_BEGIN/END
: infrastructure to use COMPILE_TEST without CONFIG_OF
: - DT updates
: - Detangle h8300 linux/irqchip.h inclusion
: .
h8300: Fix linux/irqchip.h include mess
dt-bindings: irqchip: renesas-irqc: Document r8a774e1 bindings
irqchip: Fix compile-testing without CONFIG_OF
MAINTAINERS: update arm,vic.yaml reference
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'include/linux/irqchip.h')
| -rw-r--r-- | include/linux/irqchip.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/irqchip.h b/include/linux/irqchip.h index 7f007b9c23f8..3a091d0710ae 100644 --- a/include/linux/irqchip.h +++ b/include/linux/irqchip.h @@ -48,8 +48,9 @@ static const struct of_device_id drv_name##_irqchip_match_table[] = { {}, \ }; \ MODULE_DEVICE_TABLE(of, drv_name##_irqchip_match_table); \ -static struct platform_driver drv_name##_driver = { \ - .probe = platform_irqchip_probe, \ +static struct platform_driver drv_name##_driver = { \ + .probe = IS_ENABLED(CONFIG_IRQCHIP) ? \ + platform_irqchip_probe : NULL, \ .driver = { \ .name = #drv_name, \ .owner = THIS_MODULE, \ |