Skip to contentSkip to conversation

PM / sleep: check RTC features instead of ops in suspend_test

PATCH Applied Alexandre Belloni 2 participants 2 messages Aug 4, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PM / sleep: check RTC features instead of ops in suspend_test

Test RTC_FEATURE_ALARM instead of relying on ops->set_alarm to know whether alarms are available.

---
 kernel/power/suspend_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/suspend_test.c +1 -1
index e1ed58adb69e..d20526c5be15 100644
@@ -129,7 +129,7 @@ static int __init has_wakealarm(struct device *dev, const void *data)
 {
 	struct rtc_device *candidate = to_rtc_device(dev);
 
-	if (!candidate->ops->set_alarm)
+	if (!test_bit(RTC_FEATURE_ALARM, candidate->features))
 		return 0;
 	if (!device_may_wakeup(candidate->dev.parent))
 		return 0;
Signature · 1 line
2.31.1
maintainer Applied
#1 lore raw
Quoted 14 lines · Alexandre Belloni

Test RTC_FEATURE_ALARM instead of relying on ops->set_alarm to know whether alarms are available.

---
 kernel/power/suspend_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/suspend_test.c +0 -0
index e1ed58adb69e..d20526c5be15 100644

kernel/power/suspend_test.c static int __init has_wakealarm(struct device *dev, const void *data)

Quoted 9 lines
kernel/power/suspend_test.c +1 -2
@@ -129,7 +129,7 @@ static int __init has_wakealarm(struct device *dev, const void *data)
 {
        struct rtc_device *candidate = to_rtc_device(dev);
 
-       if (!candidate->ops->set_alarm)
+       if (!test_bit(RTC_FEATURE_ALARM, candidate->features))
                return 0;
        if (!device_may_wakeup(candidate->dev.parent))
                return 0;
--

Applied as 5.15 material, thanks!