From ddbd4132ac5c74f55a62928a87f02b41d85cb449 Mon Sep 17 00:00:00 2001 From: Dan Cross Date: Sat, 11 May 2024 01:36:45 +0000 Subject: [PATCH 1/2] trivial: Clean up white space at ends of lines. Fix some trivial lints in preparation for more invasive changes. Signed-off-by: Dan Cross --- sys/kern/kern_clock.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index a45206d617..f2f3c79ea8 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -1,13 +1,13 @@ /* * Copyright (c) 2003,2004 The DragonFly Project. All rights reserved. - * + * * This code is derived from software contributed to The DragonFly Project * by Matthew Dillon - * + * * 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. * 2. Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * 3. Neither the name of The DragonFly Project nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific, prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -30,7 +30,7 @@ * 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. - * + * * Copyright (c) 1997, 1998 Poul-Henning Kamp * Copyright (c) 1982, 1986, 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -242,7 +242,7 @@ __read_mostly time_t time_uptime; /* read-only 'passive' ut in seconds */ /* * basetime is used to calculate the compensated real time of day. The - * basetime can be modified on a per-tick basis by the adjtime(), + * basetime can be modified on a per-tick basis by the adjtime(), * ntp_adjtime(), and sysctl-based time correction APIs. * * Note that frequency corrections can also be made by adjusting @@ -518,7 +518,7 @@ set_timeofday(struct timespec *ts) * Note that basetime diverges from boottime as the clock drift is * compensated for, so we cannot do away with boottime. When setting * the absolute time of day the drift is 0 (for an instant) and we - * can simply assign boottime to basetime. + * can simply assign boottime to basetime. * * Note that nanouptime() is based on gd_time_seconds which is drift * compensated up to a point (it is guaranteed to remain monotonically @@ -540,7 +540,7 @@ set_timeofday(struct timespec *ts) crit_exit(); } - + /* * Each cpu has its own hardclock, but we only increment ticks and softticks * on cpu #0. @@ -631,7 +631,7 @@ hardclock(systimer_t info, int in_ipi, struct intrframe *frame) atomic_add_int_nonlocked(&ticktime_update, 1); #if 0 - if (tco->tc_poll_pps) + if (tco->tc_poll_pps) tco->tc_poll_pps(tco); #endif @@ -985,7 +985,7 @@ statclock(systimer_t info, int in_ipi, struct intrframe *frame) * so that we know how much of its real time was spent * in ``non-process'' (i.e., interrupt) work. * - * XXX assume system if frame is NULL. A NULL frame + * XXX assume system if frame is NULL. A NULL frame * can occur if ipi processing is done from a crit_exit(). */ if ((frame && CLKF_INTR(intr_nest)) || @@ -1068,7 +1068,7 @@ do_pctrack(struct intrframe *frame, int which) struct kinfo_pctrack *pctrack; pctrack = &cputime_pctrack[mycpu->gd_cpuid][which]; - pctrack->pc_array[pctrack->pc_index & PCTRACK_ARYMASK] = + pctrack->pc_array[pctrack->pc_index & PCTRACK_ARYMASK] = (void *)CLKF_PC(frame); ++pctrack->pc_index; } @@ -1153,7 +1153,7 @@ schedclock(systimer_t info, int in_ipi __unused, struct intrframe *frame) } /* - * Compute number of ticks for the specified amount of time. The + * Compute number of ticks for the specified amount of time. The * return value is intended to be used in a clock interrupt timed * operation and guaranteed to meet or exceed the requested time. * If the representation overflows, return INT_MAX. The minimum return @@ -1621,7 +1621,7 @@ pps_ioctl(u_long cmd, caddr_t data, struct pps_state *pps) app = (pps_params_t *)data; if (app->mode & ~pps->ppscap) return (EINVAL); - pps->ppsparam = *app; + pps->ppsparam = *app; return (0); case PPS_IOC_GETPARAMS: app = (pps_params_t *)data; @@ -1637,7 +1637,7 @@ pps_ioctl(u_long cmd, caddr_t data, struct pps_state *pps) return (EINVAL); if (fapi->timeout.tv_sec || fapi->timeout.tv_nsec) return (EOPNOTSUPP); - pps->ppsinfo.current_mode = pps->ppsparam.mode; + pps->ppsinfo.current_mode = pps->ppsparam.mode; fapi->pps_info_buf = pps->ppsinfo; return (0); case PPS_IOC_KCBIND: @@ -1756,7 +1756,7 @@ pps_event(struct pps_state *pps, sysclock_t count, int event) pps->ppscount[2] = count; if (tcount >= sys_cputimer->freq) { delta = (1000000000 * (tcount / sys_cputimer->freq) + - sys_cputimer->freq64_nsec * + sys_cputimer->freq64_nsec * (tcount % sys_cputimer->freq)) >> 32; } else { delta = muldivu64(sys_cputimer->freq64_nsec, -- 2.42.0