1 files changed, 36 insertions, 91 deletions

diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index b1ebca099b0d..e9e8d02743ee 100644
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * An rtc/i2c driver for the Dallas DS1672
  * Copyright 2005-06 Tower Technologies
  *
  * Author: Alessandro Zummo <a.zummo@towertech.it>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/i2c.h>
@@ -21,17 +18,16 @@
 
 #define DS1672_REG_CONTROL_EOSC 0x80
 
-static struct i2c_driver ds1672_driver;
-
 /*
  * In the routines that deal directly with the ds1672 hardware, we use
  * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch
- * Epoch is initialized as 2000. Time is set to UTC.
+ * Time is set to UTC.
  */
-static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
+static int ds1672_read_time(struct device *dev, struct rtc_time *tm)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         unsigned long time;
-        unsigned char addr = DS1672_REG_CNT_BASE;
+        unsigned char addr = DS1672_REG_CONTROL;
         unsigned char buf[4];
 
         struct i2c_msg msgs[] = {
@@ -43,11 +39,25 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
                 {/* read date */
                         .addr = client->addr,
                         .flags = I2C_M_RD,
-                        .len = 4,
+                        .len = 1,
                         .buf = buf
                 },
         };
 
+        /* read control register */
+        if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
+                dev_warn(&client->dev, "Unable to read the control register\n");
+                return -EIO;
+        }
+
+        if (buf[0] & DS1672_REG_CONTROL_EOSC) {
+                dev_warn(&client->dev, "Oscillator not enabled. Set time to enable.\n");
+                return -EINVAL;
+        }
+
+        addr = DS1672_REG_CNT_BASE;
+        msgs[1].len = 4;
+
         /* read date registers */
         if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
                 dev_err(&client->dev, "%s: read error\n", __func__);
@@ -61,20 +71,19 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
         time = ((unsigned long)buf[3] << 24) | (buf[2] << 16) |
                (buf[1] << 8) | buf[0];
 
-        rtc_time_to_tm(time, tm);
+        rtc_time64_to_tm(time, tm);
 
-        dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
-                "mday=%d, mon=%d, year=%d, wday=%d\n",
-                __func__, tm->tm_sec, tm->tm_min, tm->tm_hour,
-                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+        dev_dbg(&client->dev, "%s: tm is %ptR\n", __func__, tm);
 
         return 0;
 }
 
-static int ds1672_set_mmss(struct i2c_client *client, unsigned long secs)
+static int ds1672_set_time(struct device *dev, struct rtc_time *tm)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         int xfer;
         unsigned char buf[6];
+        unsigned long secs = rtc_tm_to_time64(tm);
 
         buf[0] = DS1672_REG_CNT_BASE;
         buf[1] = secs & 0x000000FF;
@@ -92,71 +101,15 @@ static int ds1672_set_mmss(struct i2c_client *client, unsigned long secs)
         return 0;
 }
 
-static int ds1672_rtc_read_time(struct device *dev, struct rtc_time *tm)
-{
-        return ds1672_get_datetime(to_i2c_client(dev), tm);
-}
-
-static int ds1672_rtc_set_mmss(struct device *dev, unsigned long secs)
-{
-        return ds1672_set_mmss(to_i2c_client(dev), secs);
-}
-
-static int ds1672_get_control(struct i2c_client *client, u8 *status)
-{
-        unsigned char addr = DS1672_REG_CONTROL;
-
-        struct i2c_msg msgs[] = {
-                {/* setup read ptr */
-                        .addr = client->addr,
-                        .len = 1,
-                        .buf = &addr
-                },
-                {/* read control */
-                        .addr = client->addr,
-                        .flags = I2C_M_RD,
-                        .len = 1,
-                        .buf = status
-                },
-        };
-
-        /* read control register */
-        if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
-                dev_err(&client->dev, "%s: read error\n", __func__);
-                return -EIO;
-        }
-
-        return 0;
-}
-
-/* following are the sysfs callback functions */
-static ssize_t show_control(struct device *dev, struct device_attribute *attr,
-                            char *buf)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        u8 control;
-        int err;
-
-        err = ds1672_get_control(client, &control);
-        if (err)
-                return err;
-
-        return sprintf(buf, "%s\n", (control & DS1672_REG_CONTROL_EOSC)
-                       ? "disabled" : "enabled");
-}
-
-static DEVICE_ATTR(control, S_IRUGO, show_control, NULL);
-
 static const struct rtc_class_ops ds1672_rtc_ops = {
-        .read_time = ds1672_rtc_read_time,
-        .set_mmss = ds1672_rtc_set_mmss,
+        .read_time = ds1672_read_time,
+        .set_time = ds1672_set_time,
 };
 
 static int ds1672_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
         int err = 0;
-        u8 control;
         struct rtc_device *rtc;
 
         dev_dbg(&client->dev, "%s\n", __func__);
@@ -164,29 +117,21 @@ static int ds1672_probe(struct i2c_client *client,
         if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
                 return -ENODEV;
 
-        rtc = devm_rtc_device_register(&client->dev, ds1672_driver.driver.name,
-                                  &ds1672_rtc_ops, THIS_MODULE);
-
+        rtc = devm_rtc_allocate_device(&client->dev);
         if (IS_ERR(rtc))
                 return PTR_ERR(rtc);
 
-        i2c_set_clientdata(client, rtc);
+        rtc->ops = &ds1672_rtc_ops;
+        rtc->range_max = U32_MAX;
 
-        /* read control register */
-        err = ds1672_get_control(client, &control);
-        if (err) {
-                dev_warn(&client->dev, "Unable to read the control register\n");
-        }
+        err = rtc_register_device(rtc);
+        if (err)
+                return err;
 
-        if (control & DS1672_REG_CONTROL_EOSC)
-                dev_warn(&client->dev, "Oscillator not enabled. "
-                         "Set time to enable.\n");
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
 
-        /* Register sysfs hooks */
-        err = device_create_file(&client->dev, &dev_attr_control);
-        if (err)
-                dev_err(&client->dev, "Unable to create sysfs entry: %s\n",
-                        dev_attr_control.attr.name);
+        i2c_set_clientdata(client, rtc);
 
         return 0;
 }