Skip to contentSkip to conversation

rtc: dm355evm: convert to devm_rtc_allocate_device

PATCH New Alexandre Belloni 1 participant 4 messages Mar 20, 2019 Real time clock (RTC)

lore
Share & tools
lore

Alexandre Belloni

author maintainer
#0 lore raw

PATCH 1/4 rtc: dm355evm: convert to devm_rtc_allocate_device

This allows further improvement of the driver.

---
 drivers/rtc/rtc-dm355evm.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/rtc/rtc-dm355evm.c +6 -7
index 97d8259b9494..d44bf3929898 100644
@@ -127,16 +127,15 @@ static int dm355evm_rtc_probe(struct platform_device *pdev)
 {
 	struct rtc_device *rtc;
 
-	rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
-					&dm355evm_rtc_ops, THIS_MODULE);
-	if (IS_ERR(rtc)) {
-		dev_err(&pdev->dev, "can't register RTC device, err %ld\n",
-			PTR_ERR(rtc));
+	rtc = devm_rtc_allocate_device(&pdev->dev);
+	if (IS_ERR(rtc))
 		return PTR_ERR(rtc);
-	}
+
 	platform_set_drvdata(pdev, rtc);
 
-	return 0;
+	rtc->ops = &dm355evm_rtc_ops;
+
+	return rtc_register_device(rtc);
 }
 
 /*
Signature · 1 line
2.20.1
author maintainer
#1 lore raw

PATCH 2/4 rtc: dm355evm: set range

The MSP430 has a 32bit second counter.

---
 drivers/rtc/rtc-dm355evm.c | 1 +
 1 file changed, 1 insertion(+)
drivers/rtc/rtc-dm355evm.c +1 -0
index d44bf3929898..cd80c89d9002 100644
@@ -134,6 +134,7 @@ static int dm355evm_rtc_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, rtc);
 
 	rtc->ops = &dm355evm_rtc_ops;
+	rtc->range_max = U32_MAX;
 
 	return rtc_register_device(rtc);
 }
Signature · 1 line
2.20.1
author maintainer
#2 lore raw

PATCH 3/4 rtc: dm355evm: switch to rtc_time64_to_tm/rtc_tm_to_time64

In reply to Alexandre Belloni

Call the 64bit versions of rtc_tm time conversion as the range is enforced by the core.

---
 drivers/rtc/rtc-dm355evm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/rtc/rtc-dm355evm.c +2 -2
index cd80c89d9002..3fee96c19a5d 100644
@@ -78,7 +78,7 @@ static int dm355evm_rtc_read_time(struct device *dev, struct rtc_time *tm)
 
 	dev_dbg(dev, "read timestamp %08x\n", time.value);
 
-	rtc_time_to_tm(le32_to_cpu(time.value), tm);
+	rtc_time64_to_tm(le32_to_cpu(time.value), tm);
 	return 0;
 }
 
@@ -88,7 +88,7 @@ static int dm355evm_rtc_set_time(struct device *dev, struct rtc_time *tm)
 	unsigned long	value;
 	int		status;
 
-	rtc_tm_to_time(tm, &value);
+	value = rtc_tm_to_time64(tm);
 	time.value = cpu_to_le32(value);
 
 	dev_dbg(dev, "write timestamp %08x\n", time.value);
Signature · 1 line
2.20.1
author maintainer
#3 lore raw

PATCH 4/4 rtc: dm355evm: convert to SPDX identifier

In reply to Alexandre Belloni

Use SPDX-License-Identifier instead of a verbose license text

---
 drivers/rtc/rtc-dm355evm.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/rtc/rtc-dm355evm.c +1 -5
index 3fee96c19a5d..cd947a20843b 100644
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * rtc-dm355evm.c - access battery-backed counter in MSP430 firmware
  *
  * Copyright (c) 2008 by David Brownell
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
Signature · 1 line
2.20.1