Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux.git] / drivers / rtc / rtc-dm355evm.c

diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
index 97d8259b94940f20b9a11193ba2bd038c1ba5878..cd947a20843b360f4b09d962a55448eac41b2180 100644 (file)
--- a/drivers/rtc/rtc-dm355evm.c
+++ b/drivers/rtc/rtc-dm355evm.c
@@ -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>
@@ -78,7 +74,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 +84,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);
@@ -127,16 +123,16 @@ 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;
+       rtc->range_max = U32_MAX;
+
+       return rtc_register_device(rtc);
 }
 
 /*