Skip to content

Commit 2ffc8bf

Browse files
committed
ACPI: TAD: Split acpi_tad_rtc_read_time()
Move the code converting a struct acpi_tad_rt into a struct rtc_time from acpi_tad_rtc_read_time() into a new function, acpi_tad_rt_to_tm(), to facilitate adding alarm support to the driver's RTC class device interface going forward. No intentional functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com> [ rjw: Subject and changelog edits ] Link: https://patch.msgid.link/9619488.CDJkKcVGEf@rafael.j.wysocki Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 9bcdd4e commit 2ffc8bf

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

drivers/acpi/acpi_tad.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,17 @@ static const struct attribute_group *acpi_tad_attr_groups[] = {
617617
#ifdef CONFIG_RTC_CLASS
618618
/* RTC class device interface */
619619

620+
static void acpi_tad_rt_to_tm(struct acpi_tad_rt *rt, struct rtc_time *tm)
621+
{
622+
tm->tm_year = rt->year - 1900;
623+
tm->tm_mon = rt->month - 1;
624+
tm->tm_mday = rt->day;
625+
tm->tm_hour = rt->hour;
626+
tm->tm_min = rt->minute;
627+
tm->tm_sec = rt->second;
628+
tm->tm_isdst = rt->daylight == ACPI_TAD_TIME_ISDST;
629+
}
630+
620631
static int acpi_tad_rtc_set_time(struct device *dev, struct rtc_time *tm)
621632
{
622633
struct acpi_tad_rt rt;
@@ -642,13 +653,7 @@ static int acpi_tad_rtc_read_time(struct device *dev, struct rtc_time *tm)
642653
if (ret)
643654
return ret;
644655

645-
tm->tm_year = rt.year - 1900;
646-
tm->tm_mon = rt.month - 1;
647-
tm->tm_mday = rt.day;
648-
tm->tm_hour = rt.hour;
649-
tm->tm_min = rt.minute;
650-
tm->tm_sec = rt.second;
651-
tm->tm_isdst = rt.daylight == ACPI_TAD_TIME_ISDST;
656+
acpi_tad_rt_to_tm(&rt, tm);
652657

653658
return 0;
654659
}

0 commit comments

Comments
 (0)