rtc: drop set_mms and set_mmss64

There are no users of set_mms and set_mmss64 as they have all been
converted to set_time and are handling the tm to time conversion on their
own.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 56ed0c3a8c85e590ee54e67385817ae382849b62..4124f4dd376b33c532e94da4783ea6467186393f 100644 (file)
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -145,12 +145,6 @@ int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm)
                err = -ENODEV;
        else if (rtc->ops->set_time)
                err = rtc->ops->set_time(rtc->dev.parent, tm);
-       else if (rtc->ops->set_mmss64)
-               err = rtc->ops->set_mmss64(rtc->dev.parent,
-                                          rtc_tm_to_time64(tm));
-       else if (rtc->ops->set_mmss)
-               err = rtc->ops->set_mmss(rtc->dev.parent,
-                                        rtc_tm_to_time64(tm));
        else
                err = -EINVAL;
 

diff --git a/drivers/rtc/systohc.c b/drivers/rtc/systohc.c
index 8bf8e0c1e8fdcb18596d68124ba4f9e491decb06..8b70f0520e138c564bdd7872285baeb98d389a4b 100644 (file)
--- a/drivers/rtc/systohc.c
+++ b/drivers/rtc/systohc.c
@@ -30,8 +30,7 @@ int rtc_set_ntp_time(struct timespec64 now, unsigned long *target_nsec)
        if (!rtc)
                goto out_err;
 
-       if (!rtc->ops || (!rtc->ops->set_time && !rtc->ops->set_mmss64 &&
-                         !rtc->ops->set_mmss))
+       if (!rtc->ops || !rtc->ops->set_time)
                goto out_close;
 
        /* Compute the value of tv_nsec we require the caller to supply in
@@ -53,9 +52,6 @@ int rtc_set_ntp_time(struct timespec64 now, unsigned long *target_nsec)
 
        rtc_time64_to_tm(to_set.tv_sec, &tm);
 
-       /* rtc_hctosys exclusively uses UTC, so we call set_time here, not
-        * set_mmss.
-        */
        err = rtc_set_time(rtc, &tm);
 
 out_close:

diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 48d3f8e0b64f6a0c9444d80ea2de4a39655806d6..df666cf29ef1624bbabf8b99abefccaf8f71b9bd 100644 (file)
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -79,8 +79,6 @@ struct rtc_class_ops {
        int (*read_alarm)(struct device *, struct rtc_wkalrm *);
        int (*set_alarm)(struct device *, struct rtc_wkalrm *);
        int (*proc)(struct device *, struct seq_file *);
-       int (*set_mmss64)(struct device *, time64_t secs);
-       int (*set_mmss)(struct device *, unsigned long secs);
        int (*alarm_irq_enable)(struct device *, unsigned int enabled);
        int (*read_offset)(struct device *, long *offset);
        int (*set_offset)(struct device *, long offset);