diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/audio/audio.c | 6 | ||||
| -rw-r--r-- | sys/dev/hil/hil.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/aacreg.h | 4 | ||||
| -rw-r--r-- | sys/dev/ic/sl811hs.c | 6 | ||||
| -rw-r--r-- | sys/dev/marvell/mvxpsec.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/cxgb/cxgb_t3_hw.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/twa.c | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_reconstruct.h | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/sys/dev/audio/audio.c b/sys/dev/audio/audio.c index cf2f055ddba..fcce3c88672 100644 --- a/sys/dev/audio/audio.c +++ b/sys/dev/audio/audio.c @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.111 2021/12/05 02:56:55 msaitoh Exp $ */ +/* $NetBSD: audio.c,v 1.112 2021/12/10 20:36:03 andvar Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -138,7 +138,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.111 2021/12/05 02:56:55 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.112 2021/12/10 20:36:03 andvar Exp $"); #ifdef _KERNEL_OPT #include "audio.h" @@ -6917,7 +6917,7 @@ audio_mixers_get_format(struct audio_softc *sc, struct audio_info *ai) * It indicates the number of times reached EOF(?). * * ai.{play,record}.error (R/-) - * Non-zero indicates overflow/underflow has occured. + * Non-zero indicates overflow/underflow has occurred. * * ai.{play,record}.waiting (R/-) * Non-zero indicates that other process waits to open. diff --git a/sys/dev/hil/hil.c b/sys/dev/hil/hil.c index ee5d626f317..09823ebd355 100644 --- a/sys/dev/hil/hil.c +++ b/sys/dev/hil/hil.c @@ -1,4 +1,4 @@ -/* $NetBSD: hil.c,v 1.5 2021/08/07 16:19:11 thorpej Exp $ */ +/* $NetBSD: hil.c,v 1.6 2021/12/10 20:36:03 andvar Exp $ */ /* $OpenBSD: hil.c,v 1.24 2010/11/20 16:45:46 miod Exp $ */ /* * Copyright (c) 2003, 2004, Miodrag Vallat. @@ -390,7 +390,7 @@ hil_process_poll(struct hil_softc *sc, uint8_t stat, uint8_t c) case HIL_UNPLUGGED: /* * Remember that an unplugged event - * occured; it will be processed upon + * occurred; it will be processed upon * leaving polled mode... */ sc->sc_pending = HIL_PENDING_UNPLUGGED; diff --git a/sys/dev/ic/aacreg.h b/sys/dev/ic/aacreg.h index c33d3ecdb94..6c2f9021f4a 100644 --- a/sys/dev/ic/aacreg.h +++ b/sys/dev/ic/aacreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: aacreg.h,v 1.13 2008/10/02 08:21:57 sborrill Exp $ */ +/* $NetBSD: aacreg.h,v 1.14 2021/12/10 20:36:03 andvar Exp $ */ /*- * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc. @@ -1325,7 +1325,7 @@ typedef enum { AifEnSMARTEvent, /* SMART Event */ AifEnBatteryNeedsRecond, /* The battery needs reconditioning */ AifEnClusterEvent, /* Some cluster event */ - AifEnDiskSetEvent, /* A disk set event occured. */ + AifEnDiskSetEvent, /* A disk set event occurred. */ AifDriverNotifyStart=199, /* Notifies for host driver go here */ /* Host driver notifications start here */ AifDenMorphComplete, /* A morph operation completed */ diff --git a/sys/dev/ic/sl811hs.c b/sys/dev/ic/sl811hs.c index 053fb2bb126..e5773430cca 100644 --- a/sys/dev/ic/sl811hs.c +++ b/sys/dev/ic/sl811hs.c @@ -1,4 +1,4 @@ -/* $NetBSD: sl811hs.c,v 1.107 2021/08/09 20:49:10 andvar Exp $ */ +/* $NetBSD: sl811hs.c,v 1.108 2021/12/10 20:36:03 andvar Exp $ */ /* * Not (c) 2007 Matthew Orgass @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.107 2021/08/09 20:49:10 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.108 2021/12/10 20:36:03 andvar Exp $"); #ifdef _KERNEL_OPT #include "opt_slhci.h" @@ -2026,7 +2026,7 @@ slhci_abdone(struct slhci_softc *sc, int ab) * However, I have seen this problem again ("done but not started" * errors), which in some cases cases the SETUP status bit to remain * set on future transfers. In other cases, the SETUP bit is not set - * and no data corruption occurs. This occured while using both umass + * and no data corruption occurs. This occurred while using both umass * and aue on a powered hub (maybe triggered by some local activity * also) and needs several reads of the 200MB file to trigger. The * driver now halts if SETUP is detected. diff --git a/sys/dev/marvell/mvxpsec.c b/sys/dev/marvell/mvxpsec.c index 650a371383e..c2c4e6372a6 100644 --- a/sys/dev/marvell/mvxpsec.c +++ b/sys/dev/marvell/mvxpsec.c @@ -1,4 +1,4 @@ -/* $NetBSD: mvxpsec.c,v 1.8 2021/08/13 20:26:07 andvar Exp $ */ +/* $NetBSD: mvxpsec.c,v 1.9 2021/12/10 20:36:04 andvar Exp $ */ /* * Copyright (c) 2015 Internet Initiative Japan Inc. * All rights reserved. @@ -1280,7 +1280,7 @@ mvxpsec_eintr_ack(struct mvxpsec_softc *sc) /* * Interrupt statistics * - * this is NOT a statistics of how may times the events 'occured'. + * this is NOT a statistics of how many times the events 'occurred'. * this ONLY means how many times the events 'handled'. */ INLINE void diff --git a/sys/dev/pci/cxgb/cxgb_t3_hw.c b/sys/dev/pci/cxgb/cxgb_t3_hw.c index d9ad2e2a709..d23f3c65a1f 100644 --- a/sys/dev/pci/cxgb/cxgb_t3_hw.c +++ b/sys/dev/pci/cxgb/cxgb_t3_hw.c @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cxgb_t3_hw.c,v 1.6 2021/11/10 17:19:30 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cxgb_t3_hw.c,v 1.7 2021/12/10 20:36:04 andvar Exp $"); #ifdef CONFIG_DEFINED @@ -1218,7 +1218,7 @@ struct intr_info { * * A table driven interrupt handler that applies a set of masks to an * interrupt status word and performs the corresponding actions if the - * interrupts described by the mask have occured. The actions include + * interrupts described by the mask have occurred. The actions include * optionally printing a warning or alert message, and optionally * incrementing a stat counter. The table is terminated by an entry * specifying mask 0. Returns the number of fatal interrupt conditions. diff --git a/sys/dev/pci/twa.c b/sys/dev/pci/twa.c index 0782e41c856..1183648a180 100644 --- a/sys/dev/pci/twa.c +++ b/sys/dev/pci/twa.c @@ -1,4 +1,4 @@ -/* $NetBSD: twa.c,v 1.60 2021/08/07 16:19:14 thorpej Exp $ */ +/* $NetBSD: twa.c,v 1.61 2021/12/10 20:36:04 andvar Exp $ */ /* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */ /*- @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.60 2021/08/07 16:19:14 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.61 2021/12/10 20:36:04 andvar Exp $"); //#define TWA_DEBUG @@ -153,7 +153,7 @@ static const struct twa_message twa_aen_table[] = { {0x0000, "AEN queue empty"}, {0x0001, "Controller reset occurred"}, {0x0002, "Degraded unit detected"}, - {0x0003, "Controller error occured"}, + {0x0003, "Controller error occurred"}, {0x0004, "Background rebuild failed"}, {0x0005, "Background rebuild done"}, {0x0006, "Incomplete unit detected"}, diff --git a/sys/dev/raidframe/rf_reconstruct.h b/sys/dev/raidframe/rf_reconstruct.h index a04642ebbea..2a9c086bf30 100644 --- a/sys/dev/raidframe/rf_reconstruct.h +++ b/sys/dev/raidframe/rf_reconstruct.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconstruct.h,v 1.30 2021/07/23 00:54:45 oster Exp $ */ +/* $NetBSD: rf_reconstruct.h,v 1.31 2021/12/10 20:36:04 andvar Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -130,7 +130,7 @@ struct RF_ReconCtrl_s { RF_ReconUnitCount_t numRUsComplete; /* number of Reconstruction Units done */ RF_ReconUnitCount_t numRUsTotal; /* total number of Reconstruction Units */ int error; /* non-0 indicates that an error has - occured during reconstruction, and + occurred during reconstruction, and the reconstruction is in the process of bailing out. */ |
