 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_todr.c,v 1.45 2020/01/01 23:15:24 thorpej Exp $	*/
+/*	$NetBSD: kern_todr.c,v 1.46 2020/01/03 01:24:48 thorpej Exp $	*/
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,27 +60,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * from: Utah Hdr: clock.c 1.18 91/01/21
+ *
  *	@(#)clock.c	8.1 (Berkeley) 6/10/93
  */
 #include "opt_todr.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_todr.c,v 1.45 2020/01/01 23:15:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_todr.c,v 1.46 2020/01/03 01:24:48 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/timetc.h>
 #include <sys/intr.h>
 #include <sys/rndsource.h>
 #include <sys/mutex.h>
 #include <dev/clock_subr.h>	/* hmm.. this should probably move to sys */
 static int todr_gettime(todr_chip_handle_t, struct timeval *);
 @@ -387,47 +387,47 @@ do {									\
 	}								\
 } while (/*CONSTCOND*/0)
 #define	DISABLE_TODR_WRITES()						\
 do {									\
 	if (todr_wenable(tch, 0) != 0)					\
 		printf("%s: WARNING: cannot disable TODR writes\n",	\
 		    __func__);						\
 } while (/*CONSTCOND*/0)
 static int
 todr_gettime(todr_chip_handle_t tch, struct timeval *tvp)
+{
-	struct clock_ymdhms	dt;
+	int rv;
 	int			rv;
 	/*
 	 * Write-enable is used even when reading the TODR because
 	 * writing to registers may be required in order to do so.
 	 */
 	if (tch->todr_gettime) {
 		ENABLE_TODR_WRITES();
 		rv = tch->todr_gettime(tch, tvp);
 		DISABLE_TODR_WRITES();
 		/*
 		 * Some unconverted ports have their own references to
 		 * rtc_offset.   A converted port must not do that.
 		 */
 		if (rv == 0)
 			tvp->tv_sec += rtc_offset * 60;
 		todr_debug("TODR-GET-SECS", rv, NULL, tvp);
 		return rv;
 	} else if (tch->todr_gettime_ymdhms) {
 		struct clock_ymdhms dt = { 0 };
 		ENABLE_TODR_WRITES();
 		rv = tch->todr_gettime_ymdhms(tch, &dt);
 		DISABLE_TODR_WRITES();
 		todr_debug("TODR-GET-YMDHMS", rv, &dt, NULL);
 		if (rv)
 			return rv;
 		/*
 		 * Simple sanity checks.  Note that this includes a
 		 * value for clocks that can return a leap second.
 		 * Note that we don't support double leap seconds,
 		 * since this was apparently an error/misunderstanding
 		 * on the part of the ISO C committee, and can never
 @@ -445,39 +445,38 @@ todr_gettime(todr_chip_handle_t tch, str
 			return EINVAL;
+		}
 		tvp->tv_sec = clock_ymdhms_to_secs(&dt) + rtc_offset * 60;
 		tvp->tv_usec = 0;
 		return tvp->tv_sec < 0 ? EINVAL : 0;
+	}
 	return ENXIO;
+}
 static int
 todr_settime(todr_chip_handle_t tch, struct timeval *tvp)
+{
-	struct clock_ymdhms	dt;
+	int rv;
 	int			rv;
 	if (tch->todr_settime) {
-		/* See comments above in gettime why this is ifdef'd */
+		struct timeval copy = *tvp;
 		struct timeval	copy = *tvp;
 		copy.tv_sec -= rtc_offset * 60;
 		ENABLE_TODR_WRITES();
 		rv = tch->todr_settime(tch, &copy);
 		DISABLE_TODR_WRITES();
 		todr_debug("TODR-SET-SECS", rv, NULL, tvp);
 		return rv;
 	} else if (tch->todr_settime_ymdhms) {
-		time_t	sec = tvp->tv_sec - rtc_offset * 60;
+		struct clock_ymdhms dt;
 		time_t sec = tvp->tv_sec - rtc_offset * 60;
 		if (tvp->tv_usec >= 500000)
 			sec++;
 		clock_secs_to_ymdhms(sec, &dt);
 		ENABLE_TODR_WRITES();
 		rv = tch->todr_settime_ymdhms(tch, &dt);
 		DISABLE_TODR_WRITES();
 		todr_debug("TODR-SET-YMDHMS", rv, &dt, NULL);
 		return rv;
 	} else {
 		return ENXIO;
+	}
 	return ENXIO;
+}