From owner-svn-src-head@FreeBSD.ORG Thu Aug 12 16:13:24 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E075A1065675; Thu, 12 Aug 2010 16:13:24 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B603A8FC13; Thu, 12 Aug 2010 16:13:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7CGDO03028988; Thu, 12 Aug 2010 16:13:24 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7CGDOij028986; Thu, 12 Aug 2010 16:13:24 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201008121613.o7CGDOij028986@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 12 Aug 2010 16:13:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211228 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Aug 2010 16:13:25 -0000 Author: jkim Date: Thu Aug 12 16:13:24 2010 New Revision: 211228 URL: http://svn.freebsd.org/changeset/base/211228 Log: Provide description for 'machdep.disable_rtc_set' sysctl. Clean up style(9) nits. Remove a redundant return statement and an unnecessary variable. Modified: head/sys/kern/subr_rtc.c Modified: head/sys/kern/subr_rtc.c ============================================================================== --- head/sys/kern/subr_rtc.c Thu Aug 12 15:46:15 2010 (r211227) +++ head/sys/kern/subr_rtc.c Thu Aug 12 16:13:24 2010 (r211228) @@ -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) / 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) / 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; - } }