Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c86a6c28 authored by Xunlei Pang's avatar Xunlei Pang Committed by Alexandre Belloni
Browse files

rtc: interface: Remove rtc_set_mmss() 



Now rtc_set_mmss() has no users, just remove it.

We still have rtc_set_time() doing similar things.

Signed-off-by: default avatarXunlei Pang <pang.xunlei@linaro.org>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 460ea8d7

drivers/rtc/interface.c

+0 −45
Original line number Diff line number Diff line
@@ -91,51 +91,6 @@ int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm) 
}

EXPORT_SYMBOL_GPL(rtc_set_time);



int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs)

{

	int err;



	err = mutex_lock_interruptible(&rtc->ops_lock);

	if (err)

		return err;



	if (!rtc->ops)

		err = -ENODEV;

	else if (rtc->ops->set_mmss64)

		err = rtc->ops->set_mmss64(rtc->dev.parent, secs);

	else if (rtc->ops->set_mmss)

		err = rtc->ops->set_mmss(rtc->dev.parent, secs);

	else if (rtc->ops->read_time && rtc->ops->set_time) {

		struct rtc_time new, old;



		err = rtc->ops->read_time(rtc->dev.parent, &old);

		if (err == 0) {

			rtc_time64_to_tm(secs, &new);



			/*

			 * avoid writing when we're going to change the day of

			 * the month. We will retry in the next minute. This

			 * basically means that if the RTC must not drift

			 * by more than 1 minute in 11 minutes.

			 */

			if (!((old.tm_hour == 23 && old.tm_min == 59) ||

				(new.tm_hour == 23 && new.tm_min == 59)))

				err = rtc->ops->set_time(rtc->dev.parent,

						&new);

		}

	} else {

		err = -EINVAL;

	}



	pm_stay_awake(rtc->dev.parent);

	mutex_unlock(&rtc->ops_lock);

	/* A timer might have just expired */

	schedule_work(&rtc->irqwork);



	return err;

}

EXPORT_SYMBOL_GPL(rtc_set_mmss);



static int rtc_read_alarm_internal(struct rtc_device *rtc, struct rtc_wkalrm *alarm)

{

	int err;

include/linux/rtc.h

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ extern void devm_rtc_device_unregister(struct device *dev, 


extern int rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm);

extern int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm);

extern int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs);

extern int rtc_set_ntp_time(struct timespec64 now);

int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm);

extern int rtc_read_alarm(struct rtc_device *rtc,