rtc: imxdi: switch to rtc_time64_to_tm/rtc_tm_to_time64 (93059793) · Commits · 戴 / test

drivers/rtc/rtc-imxdi.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -552,7 +552,7 @@ static int dryice_rtc_read_time(struct device dev, struct rtc_time tm)
		unsigned long now;

		now = readl(imxdi->ioaddr + DTCMR);
		rtc_time_to_tm(now, tm);
		rtc_time64_to_tm(now, tm);

		return 0;
		}
		@@ -618,7 +618,7 @@ static int dryice_rtc_read_alarm(struct device dev, struct rtc_wkalrm alarm)
		u32 dcamr;

		dcamr = readl(imxdi->ioaddr + DCAMR);
		rtc_time_to_tm(dcamr, &alarm->time);
		rtc_time64_to_tm(dcamr, &alarm->time);

		/* alarm is enabled if the interrupt is enabled */
		alarm->enabled = (readl(imxdi->ioaddr + DIER) & DIER_CAIE) != 0;
		@@ -644,9 +644,7 @@ static int dryice_rtc_set_alarm(struct device dev, struct rtc_wkalrm alarm)
		unsigned long alarm_time;
		int rc;

		rc = rtc_tm_to_time(&alarm->time, &alarm_time);
		if (rc)
		return rc;
		alarm_time = rtc_tm_to_time64(&alarm->time);

		/* don't allow setting alarm in the past */
		now = readl(imxdi->ioaddr + DTCMR);