diff options
author | jkim <jkim@FreeBSD.org> | 2010-08-12 16:13:24 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2010-08-12 16:13:24 +0000 |
commit | 1974c6514bc5fb0a5fe1d6e8d8b27eb71e3ed023 (patch) | |
tree | 84aa2b9c607f724db910d5c15c8bd48c3310d109 /sys/kern/subr_rtc.c | |
parent | 2e34ad384bd3205d66ee6ab608cb257848c7e808 (diff) | |
download | FreeBSD-src-1974c6514bc5fb0a5fe1d6e8d8b27eb71e3ed023.zip FreeBSD-src-1974c6514bc5fb0a5fe1d6e8d8b27eb71e3ed023.tar.gz |
Provide description for 'machdep.disable_rtc_set' sysctl. Clean up style(9)
nits. Remove a redundant return statement and an unnecessary variable.
Diffstat (limited to 'sys/kern/subr_rtc.c')
-rw-r--r-- | sys/kern/subr_rtc.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/sys/kern/subr_rtc.c b/sys/kern/subr_rtc.c index e919bf0..a38c8c9 100644 --- a/sys/kern/subr_rtc.c +++ b/sys/kern/subr_rtc.c @@ -65,8 +65,8 @@ static long clock_res; /* XXX: should be kern. now, it's no longer machdep. */ static int disable_rtc_set; -SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, - CTLFLAG_RW, &disable_rtc_set, 0, ""); +SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, CTLFLAG_RW, &disable_rtc_set, + 0, "Disallow adjusting time-of-day clock"); void clock_register(device_t dev, long res) /* res has units of microseconds */ @@ -74,26 +74,22 @@ clock_register(device_t dev, long res) /* res has units of microseconds */ if (clock_dev != NULL) { if (clock_res > res) { - if (bootverbose) { + if (bootverbose) device_printf(dev, "not installed as " "time-of-day clock: clock %s has higher " "resolution\n", device_get_name(clock_dev)); - } return; - } else { - if (bootverbose) { - device_printf(clock_dev, "removed as " - "time-of-day clock: clock %s has higher " - "resolution\n", device_get_name(dev)); - } } + if (bootverbose) + device_printf(clock_dev, "removed as " + "time-of-day clock: clock %s has higher " + "resolution\n", device_get_name(dev)); } clock_dev = dev; clock_res = res; - if (bootverbose) { + if (bootverbose) device_printf(dev, "registered as a time-of-day clock " "(resolution %ldus)\n", res); - } } /* @@ -109,7 +105,7 @@ clock_register(device_t dev, long res) /* res has units of microseconds */ void inittodr(time_t base) { - struct timespec ref, ts; + struct timespec ts; int error; if (clock_dev == NULL) { @@ -136,9 +132,9 @@ inittodr(time_t base) wrong_time: if (base > 0) { - ref.tv_sec = base; - ref.tv_nsec = 0; - tc_setclock(&ref); + ts.tv_sec = base; + ts.tv_nsec = 0; + tc_setclock(&ts); } } @@ -157,9 +153,7 @@ resettodr(void) getnanotime(&ts); ts.tv_sec -= utc_offset(); /* XXX: We should really set all registered RTCs */ - if ((error = CLOCK_SETTIME(clock_dev, &ts)) != 0) { + if ((error = CLOCK_SETTIME(clock_dev, &ts)) != 0) printf("warning: clock_settime failed (%d), time-of-day clock " "not adjusted to system time\n", error); - return; - } } |