Skip to contentSkip to conversation

rtc: da9052: convert to devm_rtc_allocate_device

PATCH In review Alexandre Belloni 2 participants 6 messages Mar 6, 2020 – Mar 12, 2020

Subsystems (2)
lore
Share & tools
lore

Alexandre Belloni

author maintainer
#0 lore raw

PATCH 1/3 rtc: da9052: convert to devm_rtc_allocate_device

This allows further improvement of the driver.

---
 drivers/rtc/rtc-da9052.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/rtc/rtc-da9052.c +4 -4
index 204eb7cf1aa4..e159c5911122 100644
@@ -298,12 +298,12 @@ static int da9052_rtc_probe(struct platform_device *pdev)
 		rtc_err(rtc, "Failed to disable TICKS: %d\n", ret);
 
 	device_init_wakeup(&pdev->dev, true);
-	rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
-				       &da9052_rtc_ops, THIS_MODULE);
-
+	rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
 	if (IS_ERR(rtc->rtc))
 		return PTR_ERR(rtc->rtc);
 
+	rtc->rtc->ops = &da9052_rtc_ops;
+
 	ret = da9052_request_irq(rtc->da9052, DA9052_IRQ_ALARM, "ALM",
 				da9052_rtc_irq, rtc);
 	if (ret != 0) {
@@ -311,7 +311,7 @@ static int da9052_rtc_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	return 0;
+	return rtc_register_device(rtc->rtc);
 }
 
 static struct platform_driver da9052_rtc_driver = {
Signature · 1 line
2.24.1
author maintainer
#1 lore raw

PATCH 2/3 rtc: da9052: set range

The da9052 is an rtc valid from 2000 to 2063 (max year is 63).

---
 drivers/rtc/rtc-da9052.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/rtc/rtc-da9052.c +2 -0
index e159c5911122..27cde834a1b8 100644
@@ -303,6 +303,8 @@ static int da9052_rtc_probe(struct platform_device *pdev)
 		return PTR_ERR(rtc->rtc);
 
 	rtc->rtc->ops = &da9052_rtc_ops;
+	rtc->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
+	rtc->rtc->range_max = RTC_TIMESTAMP_END_2063;
 
 	ret = da9052_request_irq(rtc->da9052, DA9052_IRQ_ALARM, "ALM",
 				da9052_rtc_irq, rtc);
Signature · 1 line
2.24.1
Acked-by on v1 2/3
#2 lore raw

RE: [PATCH 2/3] rtc: da9052: set range

Quoted 3 lines · Alexandre Belloni

The da9052 is an rtc valid from 2000 to 2063 (max year is 63).

Quoted 20 lines
---
 drivers/rtc/rtc-da9052.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/rtc/rtc-da9052.c +2 -0
index e159c5911122..27cde834a1b8 100644
@@ -303,6 +303,8 @@ static int da9052_rtc_probe(struct platform_device
 *pdev)
 		return PTR_ERR(rtc->rtc);
 
 	rtc->rtc->ops = &da9052_rtc_ops;
+	rtc->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
+	rtc->rtc->range_max = RTC_TIMESTAMP_END_2063;
 
 	ret = da9052_request_irq(rtc->da9052, DA9052_IRQ_ALARM, "ALM",

da9052_rtc_irq, rtc);
--
2.24.1

author maintainer
#3 lore raw

PATCH 3/3 rtc: da9052: switch to rtc_time64_to_tm/rtc_tm_to_time64

In reply to Alexandre Belloni

Call the 64bit versions of rtc_tm time conversion.

---
 drivers/rtc/rtc-da9052.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/rtc/rtc-da9052.c +2 -4
index 27cde834a1b8..1c567f86ee30 100644
@@ -103,13 +103,11 @@ static int da9052_set_alarm(struct da9052_rtc *rtc, struct rtc_time *rtc_tm)
 	int ret;
 	uint8_t v[3];
 
-	ret = rtc_tm_to_time(rtc_tm, &alm_time);
-	if (ret != 0)
-		return ret;
+	alm_time = rtc_tm_to_time64(rtc_tm);
 
 	if (rtc_tm->tm_sec > 0) {
 		alm_time += 60 - rtc_tm->tm_sec;
-		rtc_time_to_tm(alm_time, rtc_tm);
+		rtc_time64_to_tm(alm_time, rtc_tm);
 	}
 	BUG_ON(rtc_tm->tm_sec); /* it will cause repeated irqs if not zero */
 
Signature · 1 line
2.24.1
Acked-by on v1 3/3
#4 lore raw

RE: [PATCH 3/3] rtc: da9052: switch to rtc_time64_to_tm/rtc_tm_to_time64

Quoted 3 lines · Alexandre Belloni

Call the 64bit versions of rtc_tm time conversion.

Quoted 27 lines
---
 drivers/rtc/rtc-da9052.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/rtc/rtc-da9052.c +2 -5
index 27cde834a1b8..1c567f86ee30 100644
@@ -103,13 +103,11 @@ static int da9052_set_alarm(struct da9052_rtc *rtc,
 struct rtc_time *rtc_tm)
 	int ret;
 	uint8_t v[3];
 
-	ret = rtc_tm_to_time(rtc_tm, &alm_time);
-	if (ret != 0)
-		return ret;
+	alm_time = rtc_tm_to_time64(rtc_tm);
 
 	if (rtc_tm->tm_sec > 0) {
 		alm_time += 60 - rtc_tm->tm_sec;
-		rtc_time_to_tm(alm_time, rtc_tm);
+		rtc_time64_to_tm(alm_time, rtc_tm);
 	}
 	BUG_ON(rtc_tm->tm_sec); /* it will cause repeated irqs if not zero */
 
--

2.24.1

#5 lore raw
In reply to Alexandre Belloni
Quoted 29 lines · Alexandre Belloni

This allows further improvement of the driver.

---
 drivers/rtc/rtc-da9052.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/rtc/rtc-da9052.c +3 -3
index 204eb7cf1aa4..e159c5911122 100644
@@ -298,12 +298,12 @@ static int da9052_rtc_probe(struct platform_device
 *pdev)
 		rtc_err(rtc, "Failed to disable TICKS: %d\n", ret);
 
 	device_init_wakeup(&pdev->dev, true);
-	rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
-				       &da9052_rtc_ops, THIS_MODULE);
-
+	rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
 	if (IS_ERR(rtc->rtc))
 		return PTR_ERR(rtc->rtc);
 
+	rtc->rtc->ops = &da9052_rtc_ops;
+
 	ret = da9052_request_irq(rtc->da9052, DA9052_IRQ_ALARM, "ALM",
 				da9052_rtc_irq, rtc);
drivers/rtc/rtc-da9052.c +0 -0
 	if (ret != 0) {

drivers/rtc/rtc-da9052.c static int da9052_rtc_probe(struct platform_device · line 315

Quoted 6 lines
drivers/rtc/rtc-da9052.c +1 -1
@@ -311,7 +311,7 @@ static int da9052_rtc_probe(struct platform_device
 *pdev)
 		return ret;
 	}
 
-	return 0;
+	return rtc_register_device(rtc->rtc);

It seems with this change there's no tidy up around the IRQ. da9052_request_irq() isn't calling a devm_* function so I'm not sure how the IRQ is being freed on failure. In actual fact it looks like there's no _remove() function for this driver which, although that's a separate topic.

Quoted 5 lines
drivers/rtc/rtc-da9052.c +0 -0
 }
 

static struct platform_driver da9052_rtc_driver = {
--
2.24.1