diff options
| -rw-r--r-- | sys-utils/hwclock-rtc.c | 11 | ||||
| -rw-r--r-- | sys-utils/hwclock.h | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/sys-utils/hwclock-rtc.c b/sys-utils/hwclock-rtc.c index a660e32ba..c50011aec 100644 --- a/sys-utils/hwclock-rtc.c +++ b/sys-utils/hwclock-rtc.c @@ -216,9 +216,8 @@ static int busywait_for_rtc_clock_tick(const struct hwclock_control *ctl, rtc_dev_name); } - rc = do_rtc_read_ioctl(rtc_fd, &start_time); - if (rc) - return RTC_BUSYWAIT_FAILED; + if (do_rtc_read_ioctl(rtc_fd, &start_time)) + return 1; /* * Wait for change. Should be within a second, but in case @@ -233,13 +232,13 @@ static int busywait_for_rtc_clock_tick(const struct hwclock_control *ctl, gettimeofday(&now, NULL); if (time_diff(now, begin) > 1.5) { warnx(_("Timed out waiting for time change.")); - return RTC_BUSYWAIT_TIMEOUT; + return 1; } } while (1); if (rc) - return RTC_BUSYWAIT_FAILED; - return RTC_BUSYWAIT_OK; + return 1; + return 0; } /* diff --git a/sys-utils/hwclock.h b/sys-utils/hwclock.h index 8843501f3..6943d8d79 100644 --- a/sys-utils/hwclock.h +++ b/sys-utils/hwclock.h @@ -9,12 +9,6 @@ #include "c.h" -enum { - RTC_BUSYWAIT_OK = 0, - RTC_BUSYWAIT_FAILED, - RTC_BUSYWAIT_TIMEOUT -}; - struct hwclock_control { char *date_opt; char *adj_file_name; |