diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-31 11:04:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-31 11:04:51 -0700 |
| commit | 5dad26235c4adde4199c7750c696fd729e5020ae (patch) | |
| tree | bbf305ccac077b8f5156eb502cd67687b92453c8 /drivers | |
| parent | 448f828feb495c93fc78f5bb15716968a64fe6f8 (diff) | |
| parent | 9e81e329508576b499b5c47ab106b5fa45ce96d9 (diff) | |
| download | linux-5dad26235c4adde4199c7750c696fd729e5020ae.tar.gz linux-5dad26235c4adde4199c7750c696fd729e5020ae.tar.bz2 linux-5dad26235c4adde4199c7750c696fd729e5020ae.zip | |
Merge tag 'irq_urgent_for_v6.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Borislav Petkov:
- Fix an unused function warning on irqchip/irq-armada-370-xp
- Fix the IRQ sharing with pinctrl-amd and ACPI OSL
* tag 'irq_urgent_for_v6.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/armada-370-xp: Suppress unused-function warning
genirq: Introduce IRQF_COND_ONESHOT and use it in pinctrl-amd
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/irqchip/irq-armada-370-xp.c | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-amd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index a55528469278..4b021a67bdfe 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -316,7 +316,7 @@ static int armada_370_xp_msi_init(struct device_node *node, return 0; } #else -static void armada_370_xp_msi_reenable_percpu(void) {} +static __maybe_unused void armada_370_xp_msi_reenable_percpu(void) {} static inline int armada_370_xp_msi_init(struct device_node *node, phys_addr_t main_int_phys_base) diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c index 49f89b70dcec..7f66ec73199a 100644 --- a/drivers/pinctrl/pinctrl-amd.c +++ b/drivers/pinctrl/pinctrl-amd.c @@ -1159,7 +1159,7 @@ static int amd_gpio_probe(struct platform_device *pdev) } ret = devm_request_irq(&pdev->dev, gpio_dev->irq, amd_gpio_irq_handler, - IRQF_SHARED | IRQF_ONESHOT, KBUILD_MODNAME, gpio_dev); + IRQF_SHARED | IRQF_COND_ONESHOT, KBUILD_MODNAME, gpio_dev); if (ret) goto out2; |