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

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

diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
index 1932a4f861d1b993893a35fa6b3f073ea5af4b46..1766496385fed78a6db7ce5171eba1b5a5e935e6 100644 (file)
--- a/drivers/rtc/rtc-ep93xx.c
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * A driver for the RTC embedded in the Cirrus Logic EP93XX processors
  * Copyright (c) 2006 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/module.h>
@@ -18,27 +15,23 @@
 #define EP93XX_RTC_DATA                        0x000
 #define EP93XX_RTC_MATCH               0x004
 #define EP93XX_RTC_STATUS              0x008
-#define  EP93XX_RTC_STATUS_INTR                 (1<<0)
+#define  EP93XX_RTC_STATUS_INTR                 BIT(0)
 #define EP93XX_RTC_LOAD                        0x00C
 #define EP93XX_RTC_CONTROL             0x010
-#define  EP93XX_RTC_CONTROL_MIE                 (1<<0)
+#define  EP93XX_RTC_CONTROL_MIE                 BIT(0)
 #define EP93XX_RTC_SWCOMP              0x108
 #define  EP93XX_RTC_SWCOMP_DEL_MASK     0x001f0000
 #define  EP93XX_RTC_SWCOMP_DEL_SHIFT    16
 #define  EP93XX_RTC_SWCOMP_INT_MASK     0x0000ffff
 #define  EP93XX_RTC_SWCOMP_INT_SHIFT    0
 
-/*
- * struct device dev.platform_data is used to store our private data
- * because struct rtc_device does not have a variable to hold it.
- */
 struct ep93xx_rtc {
        void __iomem    *mmio_base;
        struct rtc_device *rtc;
 };
 
 static int ep93xx_rtc_get_swcomp(struct device *dev, unsigned short *preload,
-                               unsigned short *delete)
+                                unsigned short *delete)
 {
        struct ep93xx_rtc *ep93xx_rtc = dev_get_platdata(dev);
        unsigned long comp;
@@ -63,13 +56,14 @@ static int ep93xx_rtc_read_time(struct device *dev, struct rtc_time *tm)
 
        time = readl(ep93xx_rtc->mmio_base + EP93XX_RTC_DATA);
 
-       rtc_time_to_tm(time, tm);
+       rtc_time64_to_tm(time, tm);
        return 0;
 }
 
-static int ep93xx_rtc_set_mmss(struct device *dev, unsigned long secs)
+static int ep93xx_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
        struct ep93xx_rtc *ep93xx_rtc = dev_get_platdata(dev);
+       unsigned long secs = rtc_tm_to_time64(tm);
 
        writel(secs + 1, ep93xx_rtc->mmio_base + EP93XX_RTC_LOAD);
        return 0;
@@ -89,31 +83,31 @@ static int ep93xx_rtc_proc(struct device *dev, struct seq_file *seq)
 
 static const struct rtc_class_ops ep93xx_rtc_ops = {
        .read_time      = ep93xx_rtc_read_time,
-       .set_mmss       = ep93xx_rtc_set_mmss,
+       .set_time       = ep93xx_rtc_set_time,
        .proc           = ep93xx_rtc_proc,
 };
 
-static ssize_t ep93xx_rtc_show_comp_preload(struct device *dev,
-                       struct device_attribute *attr, char *buf)
+static ssize_t comp_preload_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
        unsigned short preload;
 
-       ep93xx_rtc_get_swcomp(dev, &preload, NULL);
+       ep93xx_rtc_get_swcomp(dev->parent, &preload, NULL);
 
        return sprintf(buf, "%d\n", preload);
 }
-static DEVICE_ATTR(comp_preload, S_IRUGO, ep93xx_rtc_show_comp_preload, NULL);
+static DEVICE_ATTR_RO(comp_preload);
 
-static ssize_t ep93xx_rtc_show_comp_delete(struct device *dev,
-                       struct device_attribute *attr, char *buf)
+static ssize_t comp_delete_show(struct device *dev,
+                               struct device_attribute *attr, char *buf)
 {
        unsigned short delete;
 
-       ep93xx_rtc_get_swcomp(dev, NULL, &delete);
+       ep93xx_rtc_get_swcomp(dev->parent, NULL, &delete);
 
        return sprintf(buf, "%d\n", delete);
 }
-static DEVICE_ATTR(comp_delete, S_IRUGO, ep93xx_rtc_show_comp_delete, NULL);
+static DEVICE_ATTR_RO(comp_delete);
 
 static struct attribute *ep93xx_rtc_attrs[] = {
        &dev_attr_comp_preload.attr,
@@ -140,33 +134,20 @@ static int ep93xx_rtc_probe(struct platform_device *pdev)
        if (IS_ERR(ep93xx_rtc->mmio_base))
                return PTR_ERR(ep93xx_rtc->mmio_base);
 
-       pdev->dev.platform_data = ep93xx_rtc;
        platform_set_drvdata(pdev, ep93xx_rtc);
 
-       ep93xx_rtc->rtc = devm_rtc_device_register(&pdev->dev,
-                               pdev->name, &ep93xx_rtc_ops, THIS_MODULE);
-       if (IS_ERR(ep93xx_rtc->rtc)) {
-               err = PTR_ERR(ep93xx_rtc->rtc);
-               goto exit;
-       }
+       ep93xx_rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
+       if (IS_ERR(ep93xx_rtc->rtc))
+               return PTR_ERR(ep93xx_rtc->rtc);
 
-       err = sysfs_create_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
-       if (err)
-               goto exit;
-
-       return 0;
+       ep93xx_rtc->rtc->ops = &ep93xx_rtc_ops;
+       ep93xx_rtc->rtc->range_max = U32_MAX;
 
-exit:
-       pdev->dev.platform_data = NULL;
-       return err;
-}
-
-static int ep93xx_rtc_remove(struct platform_device *pdev)
-{
-       sysfs_remove_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
-       pdev->dev.platform_data = NULL;
+       err = rtc_add_group(ep93xx_rtc->rtc, &ep93xx_rtc_sysfs_files);
+       if (err)
+               return err;
 
-       return 0;
+       return rtc_register_device(ep93xx_rtc->rtc);
 }
 
 static struct platform_driver ep93xx_rtc_driver = {
@@ -174,7 +155,6 @@ static struct platform_driver ep93xx_rtc_driver = {
                .name   = "ep93xx-rtc",
        },
        .probe          = ep93xx_rtc_probe,
-       .remove         = ep93xx_rtc_remove,
 };
 
 module_platform_driver(ep93xx_rtc_driver);