rtc: davinci: remove useless 24h alarm handling (dc924ce9) · Commits · 戴 / test

The code handling invalid alarms meaning the alarm is in the next 24 hours is not necessary since commit ("rtc: remove "RTC_ALM_SET mode" bugs") which actually predates this driver. Since then, .set_alarm is never called with an invalid alarm and this handling is not necessary in the driver. Link: https://lore.kernel.org/r/20200305215022.32533-2-alexandre.belloni@bootlin.com Signed-off-by:

Alexandre Belloni <alexandre.belloni@bootlin.com>

drivers/rtc/rtc-davinci.c

+0 −21

Original line number	Diff line number	Diff line
		@@ -413,27 +413,6 @@ static int davinci_rtc_set_alarm(struct device dev, struct rtc_wkalrm alm)
		unsigned long flags;
		u16 days;

		if (alm->time.tm_mday <= 0 && alm->time.tm_mon < 0
		&& alm->time.tm_year < 0) {
		struct rtc_time tm;
		unsigned long now, then;

		davinci_rtc_read_time(dev, &tm);
		rtc_tm_to_time(&tm, &now);

		alm->time.tm_mday = tm.tm_mday;
		alm->time.tm_mon = tm.tm_mon;
		alm->time.tm_year = tm.tm_year;
		rtc_tm_to_time(&alm->time, &then);

		if (then < now) {
		rtc_time_to_tm(now + 24 * 60 * 60, &tm);
		alm->time.tm_mday = tm.tm_mday;
		alm->time.tm_mon = tm.tm_mon;
		alm->time.tm_year = tm.tm_year;
		}
		}

		if (convert2days(&days, &alm->time) < 0)
		return -EINVAL;

Admin message