[PATCH v2] rtc: cmos: Use platform_get_irq_optional() in cmos_platform_probe()

Rafael J. Wysocki posted 1 patch 1 month, 1 week ago
drivers/rtc/rtc-cmos.c |   13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
[PATCH v2] rtc: cmos: Use platform_get_irq_optional() in cmos_platform_probe()
Posted by Rafael J. Wysocki 1 month, 1 week ago
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

The rtc-cmos driver can live without an IRQ and returning an error
code from platform_get_irq() is not a problem for it in general, so
make it call platform_get_irq_optional() in cmos_platform_probe()
instead of platform_get_irq() to avoid a confusing error message
printed by the latter if an IRQ cannot be found for index 0, which
is possible on x86 platforms.

Additionally, on x86, if the IRQ is not defined and the system has
a legacy PIC, hardcode it to RTC_IRQ, which should be safe then (and
which is what the dropped PNP code did).

Fixes: d15f1c2e413e ("ACPI: PNP: Drop CMOS RTC PNP device support")
Reported-by: Nathan Chancellor <nathan@kernel.org>
Closes: https://lore.kernel.org/linux-acpi/20260303060752.GA2749263@ax162/
Tested-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

v1 -> v2: Added tags, edited changelog

This is linux-next material.

---
 drivers/rtc/rtc-cmos.c |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -1423,9 +1423,18 @@ static int __init cmos_platform_probe(st
 		resource = platform_get_resource(pdev, IORESOURCE_IO, 0);
 	else
 		resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	irq = platform_get_irq(pdev, 0);
-	if (irq < 0)
+	irq = platform_get_irq_optional(pdev, 0);
+	if (irq < 0) {
 		irq = -1;
+#ifdef CONFIG_X86
+		/*
+		 * On some x86 systems, the IRQ is not defined, but it should
+		 * always be safe to hardcode it on systems with a legacy PIC.
+		 */
+		if (nr_legacy_irqs())
+			irq = RTC_IRQ;
+#endif
+	}
 
 	return cmos_do_probe(&pdev->dev, resource, irq);
 }
Re: [PATCH v2] rtc: cmos: Use platform_get_irq_optional() in cmos_platform_probe()
Posted by Alexandre Belloni 1 week, 3 days ago
On Wed, 04 Mar 2026 13:55:43 +0100, Rafael J. Wysocki wrote:
> The rtc-cmos driver can live without an IRQ and returning an error
> code from platform_get_irq() is not a problem for it in general, so
> make it call platform_get_irq_optional() in cmos_platform_probe()
> instead of platform_get_irq() to avoid a confusing error message
> printed by the latter if an IRQ cannot be found for index 0, which
> is possible on x86 platforms.
> 
> [...]

Applied, thanks!

[1/1] rtc: cmos: Use platform_get_irq_optional() in cmos_platform_probe()
      https://git.kernel.org/abelloni/c/92bad323175e

Best regards,

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com