Thread (22 messages) read the whole thread 22 messages, 3 authors, 2021-04-28
STALE1920d LANDED

Landed in mainline as d9b0dd54a194 on 2021-01-16.

[PATCH 02/17] rtc: pl031: use RTC_FEATURE_ALARM

From: Alexandre Belloni <alexandre.belloni@bootlin.com>
Date: 2021-01-10 23:18:59
Also in: linux-arm-kernel, linux-rtc, lkml
Subsystem: arm/nomadik/ux500 architectures, real time clock (rtc) subsystem, the rest · Maintainers: Linus Walleij, Alexandre Belloni, Linus Torvalds

Clear RTC_FEATURE_ALARM instead of setting set_alarm, read_alarm and
alarm_irq_enable to NULL.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
 drivers/rtc/rtc-pl031.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index 224bbf096262..7c3967df4f9a 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -352,12 +352,8 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
 		}
 	}
 
-	if (!adev->irq[0]) {
-		/* When there's no interrupt, no point in exposing the alarm */
-		ops->read_alarm = NULL;
-		ops->set_alarm = NULL;
-		ops->alarm_irq_enable = NULL;
-	}
+	if (!adev->irq[0])
+		clear_bit(RTC_FEATURE_ALARM, ldata->rtc->features);
 
 	device_init_wakeup(&adev->dev, true);
 	ldata->rtc = devm_rtc_allocate_device(&adev->dev);
-- 
2.29.2
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help