diff options
| -rw-r--r-- | sys-utils/hwclock-rtc.c | 20 | ||||
| -rw-r--r-- | sys-utils/hwclock.c | 2 | ||||
| -rw-r--r-- | sys-utils/hwclock.h | 2 |
3 files changed, 10 insertions, 14 deletions
diff --git a/sys-utils/hwclock-rtc.c b/sys-utils/hwclock-rtc.c index 077db73e7..f2728284d 100644 --- a/sys-utils/hwclock-rtc.c +++ b/sys-utils/hwclock-rtc.c @@ -396,27 +396,23 @@ struct clock_ops *probe_for_rtc_clock(const struct hwclock_control *ctl) /* * Get the Hardware Clock epoch setting from the kernel. */ -int get_epoch_rtc(const struct hwclock_control *ctl, unsigned long *epoch_p, - int silent) +int get_epoch_rtc(const struct hwclock_control *ctl, unsigned long *epoch_p) { int rtc_fd; rtc_fd = open_rtc(ctl); if (rtc_fd < 0) { - if (!silent) { - if (errno == ENOENT) - warnx(_ - ("To manipulate the epoch value in the kernel, we must " - "access the Linux 'rtc' device driver via the device special " - "file. This file does not exist on this system.")); - else - warn(_("cannot open rtc device")); - } + if (errno == ENOENT) + warnx(_ + ("To manipulate the epoch value in the kernel, we must " + "access the Linux 'rtc' device driver via the device special " + "file. This file does not exist on this system.")); + else + warn(_("cannot open rtc device")); return 1; } if (ioctl(rtc_fd, RTC_EPOCH_READ, epoch_p) == -1) { - if (!silent) warn(_("ioctl(RTC_EPOCH_READ) to %s failed"), rtc_dev_name); return 1; diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index 8914f9445..3875bcc54 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -1190,7 +1190,7 @@ manipulate_epoch(const struct hwclock_control *ctl) if (ctl->getepoch) { unsigned long epoch; - if (get_epoch_rtc(ctl, &epoch, 0)) + if (get_epoch_rtc(ctl, &epoch)) warnx(_ ("Unable to get the epoch value from the kernel.")); else diff --git a/sys-utils/hwclock.h b/sys-utils/hwclock.h index f090ed7ca..37e817314 100644 --- a/sys-utils/hwclock.h +++ b/sys-utils/hwclock.h @@ -67,7 +67,7 @@ extern unsigned long epoch_option; extern double time_diff(struct timeval subtrahend, struct timeval subtractor); /* rtc.c */ -extern int get_epoch_rtc(const struct hwclock_control *ctl, unsigned long *epoch, int silent); +extern int get_epoch_rtc(const struct hwclock_control *ctl, unsigned long *epoch); extern int set_epoch_rtc(const struct hwclock_control *ctl); extern void hwclock_exit(const struct hwclock_control *ctl, int status); |