spelling

feedback and ok tb@ jmc@ ok ratchov@

43 files changed, 137 insertions, 137 deletions

diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index afc423dbbb6..350580c00b3 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci.c,v 1.217 2021/11/22 11:46:11 mglocker Exp $ */
+/*	$OpenBSD: ehci.c,v 1.218 2022/01/09 05:43:00 jsg Exp $ */
 /*	$NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $	*/
 
 /*
@@ -1714,7 +1714,7 @@ usb_device_descriptor_t ehci_devd = {
 	UDPROTO_HSHUBSTT,	/* protocol */
 	64,			/* max packet */
 	{0},{0},{0x00,0x01},	/* device id */
-	1,2,0,			/* string indicies */
+	1,2,0,			/* string indices */
 	1			/* # of configurations */
 };
 
@@ -2573,7 +2573,7 @@ ehci_free_itd(struct ehci_softc *sc, struct ehci_soft_itd *itd)
 }
 
 /*
- * Close a reqular pipe.
+ * Close a regular pipe.
  * Assumes that there are no pending transactions.
  */
 void
@@ -3179,7 +3179,7 @@ ehci_device_intr_abort(struct usbd_xfer *xfer)
 
 	/*
 	 * XXX - abort_xfer uses ehci_sync_hc, which syncs via the advance
-	 *       async doorbell. That's dependant on the async list, wheras
+	 *       async doorbell. That's dependant on the async list, whereas
 	 *       intr xfers are periodic, should not use this?
 	 */
 	ehci_abort_xfer(xfer, USBD_CANCELLED);
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index 9f8d7c1beff..6247848b830 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.usb,v 1.148 2021/12/20 14:54:37 hastings Exp $
+#	$OpenBSD: files.usb,v 1.149 2022/01/09 05:43:00 jsg Exp $
 #	$NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $
 #
 # Config file and device description for machine-independent USB code.
@@ -117,7 +117,7 @@ device	ubcmtp: wsmousedev
 attach	ubcmtp at uhub
 file	dev/usb/ubcmtp.c		ubcmtp
 
-# Cypress microcontroller based serial adpaters
+# Cypress microcontroller based serial adapters
 device	ucycom: hid, ucombus
 attach	ucycom at uhidbus
 file	dev/usb/ucycom.c		ucycom
@@ -157,7 +157,7 @@ device	utrh: hid
 attach	utrh at uhidbus
 file	dev/usb/utrh.c			utrh
 
-# Fujitsu Compnent Smart Power Strip FX-5204PS
+# Fujitsu Component Smart Power Strip FX-5204PS
 device	usps
 attach	usps at uhub
 file	dev/usb/usps.c			usps
diff --git a/sys/dev/usb/if_athn_usb.h b/sys/dev/usb/if_athn_usb.h
index a45c996311f..75bc0e8d359 100644
--- a/sys/dev/usb/if_athn_usb.h
+++ b/sys/dev/usb/if_athn_usb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_athn_usb.h,v 1.12 2020/11/30 16:09:33 krw Exp $	*/
+/*	$OpenBSD: if_athn_usb.h,v 1.13 2022/01/09 05:43:00 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@@ -218,7 +218,7 @@ struct ar_htc_frame_hdr {
 	uint8_t		control[4];
 } __packed;
 
-/* Structure for HTC enpoint id 0. */
+/* Structure for HTC endpoint id 0. */
 struct ar_htc_msg_hdr {
 	uint16_t	msg_id;
 #define AR_HTC_MSG_READY		0x0001
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index 87f4dcdc587..38246930c43 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atu.c,v 1.132 2020/07/31 10:49:32 mglocker Exp $ */
+/*	$OpenBSD: if_atu.c,v 1.133 2022/01/09 05:43:00 jsg Exp $ */
 /*
  * Copyright (c) 2003, 2004
  *	Daan Vreeken <Danovitsch@Vitsch.net>.  All rights reserved.
@@ -1280,7 +1280,7 @@ atu_attach(struct device *parent, struct device *self, void *aux)
 	 * Check in the interface descriptor if we're in DFU mode
 	 * If we're in DFU mode, we upload the external firmware
 	 * If we're not, the PC must have rebooted without power-cycling
-	 * the device.. I've tried this out, a reboot only requeres the
+	 * the device. I've tried this out, a reboot only requires the
 	 * external firmware to be reloaded :)
 	 *
 	 * Hmm. The at76c505a doesn't report a DFU descriptor when it's
@@ -1647,7 +1647,7 @@ atu_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 			/*
 			 * My experience with USBD_IOERROR is that trying to
 			 * restart the transfer will always fail and we'll
-			 * keep on looping restarting transfers untill someone
+			 * keep on looping restarting transfers until someone
 			 * pulls the plug of the device.
 			 * So we don't restart the transfer, but just let it
 			 * die... If someone knows of a situation where we can
diff --git a/sys/dev/usb/if_atureg.h b/sys/dev/usb/if_atureg.h
index 23e15fadaa4..f298f90400f 100644
--- a/sys/dev/usb/if_atureg.h
+++ b/sys/dev/usb/if_atureg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atureg.h,v 1.33 2013/04/15 09:23:01 mglocker Exp $ */
+/*	$OpenBSD: if_atureg.h,v 1.34 2022/01/09 05:43:00 jsg Exp $ */
 /*
  * Copyright (c) 2003
  *	Daan Vreeken <Danovitsch@Vitsch.net>.  All rights reserved.
@@ -408,7 +408,7 @@ struct atu_fw {
 } __packed;
         
 /*
- * The header the AT76c503 puts in front of RX packets (for both managment &
+ * The header the AT76c503 puts in front of RX packets (for both management &
  * data)
  */
 struct atu_rx_hdr {
diff --git a/sys/dev/usb/if_axen.c b/sys/dev/usb/if_axen.c
index d0329d308f5..7b4cc2d4043 100644
--- a/sys/dev/usb/if_axen.c
+++ b/sys/dev/usb/if_axen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axen.c,v 1.30 2020/07/31 10:49:32 mglocker Exp $	*/
+/*	$OpenBSD: if_axen.c,v 1.31 2022/01/09 05:43:00 jsg Exp $	*/
 
 /*
  * Copyright (c) 2013 Yojiro UO <yuo@openbsd.org>
@@ -517,7 +517,7 @@ axen_ax88179_init(struct axen_softc *sc)
 	axen_cmd(sc, AXEN_CMD_MAC_WRITE, 1, AXEN_PAUSE_HIGH_WATERMARK, &val);
 
 	/* Set RX/TX configuration. */
-	/* Offloadng enable */
+	/* Offloading enable */
 #ifdef AXEN_TOE
 	val = AXEN_RXCOE_IPv4 | AXEN_RXCOE_TCPv4 | AXEN_RXCOE_UDPv4 |
 	      AXEN_RXCOE_TCPv6 | AXEN_RXCOE_UDPv6;
@@ -917,7 +917,7 @@ axen_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 	/* 
 	 * buffer map
 	 * [packet #0]...[packet #n][pkt hdr#0]..[pkt hdr#n][recv_hdr]
-	 * each packet has 0xeeee as psuedo header..
+	 * each packet has 0xeeee as pseudo header..
 	 */
 	hdr_p = (u_int32_t *)(buf + total_len - sizeof(u_int32_t));
 	rx_hdr = letoh32(*hdr_p);
@@ -987,7 +987,7 @@ axen_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
 		m->m_pkthdr.len = m->m_len = pkt_len - 6;
 
 #ifdef AXEN_TOE
-		/* cheksum err */
+		/* checksum err */
 		if ((pkt_hdr & AXEN_RXHDR_L3CSUM_ERR) || 
 		    (pkt_hdr & AXEN_RXHDR_L4CSUM_ERR)) {
 			printf("%s: checksum err (pkt#%d)\n",
diff --git a/sys/dev/usb/if_smsc.c b/sys/dev/usb/if_smsc.c
index ff59a0276cb..872a89c6fbc 100644
--- a/sys/dev/usb/if_smsc.c
+++ b/sys/dev/usb/if_smsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_smsc.c,v 1.37 2020/07/31 10:49:32 mglocker Exp $	*/
+/*	$OpenBSD: if_smsc.c,v 1.38 2022/01/09 05:43:00 jsg Exp $	*/
 /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
 /*-
  * Copyright (c) 2012
@@ -44,11 +44,11 @@
  * The chip supports both tx and rx offloading of UDP & TCP checksums, this
  * feature can be dynamically enabled/disabled.  
  *
- * RX checksuming is performed across bytes after the IPv4 header to the end of
+ * RX checksumming is performed across bytes after the IPv4 header to the end of
  * the Ethernet frame, this means if the frame is padded with non-zero values
  * the H/W checksum will be incorrect, however the rx code compensates for this.
  *
- * TX checksuming is more complicated, the device requires a special header to
+ * TX checksumming is more complicated, the device requires a special header to
  * be prefixed onto the start of the frame which indicates the start and end
  * positions of the UDP or TCP frame.  This requires the driver to manually
  * go through the packet data and decode the headers prior to sending.
@@ -834,7 +834,7 @@ smsc_chip_init(struct smsc_softc *sc)
 	}
 
 	/*
-	 * The following setings are used for 'turbo mode', a.k.a multiple
+	 * The following settings are used for 'turbo mode', a.k.a multiple
 	 * frames per Rx transaction (again info taken form Linux driver).
 	 */
 #ifdef SMSC_TURBO
diff --git a/sys/dev/usb/if_smscreg.h b/sys/dev/usb/if_smscreg.h
index 6172657a038..f201fc9c141 100644
--- a/sys/dev/usb/if_smscreg.h
+++ b/sys/dev/usb/if_smscreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_smscreg.h,v 1.5 2015/06/18 09:28:54 mpi Exp $	*/
+/*	$OpenBSD: if_smscreg.h,v 1.6 2022/01/09 05:43:00 jsg Exp $	*/
 /*-
  * Copyright (c) 2012
  *	Ben Gray <bgray@freebsd.org>.
@@ -55,7 +55,7 @@
  *      TX_CTRL_0 <12>     Last segment of frame indicator
  *      TX_CTRL_0 <10:0>   Buffer size (?)
  *
- *      TX_CTRL_1 <14>     Perform H/W checksuming on IP packets 
+ *      TX_CTRL_1 <14>     Perform H/W checksumming on IP packets 
  *      TX_CTRL_1 <13>     Disable automatic ethernet CRC generation
  *      TX_CTRL_1 <12>     Disable padding (?)
  *      TX_CTRL_1 <10:0>   Packet byte length
diff --git a/sys/dev/usb/if_udavreg.h b/sys/dev/usb/if_udavreg.h
index 15fba4c99ea..45254f8a844 100644
--- a/sys/dev/usb/if_udavreg.h
+++ b/sys/dev/usb/if_udavreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_udavreg.h,v 1.15 2015/06/19 20:39:34 uaa Exp $ */
+/*	$OpenBSD: if_udavreg.h,v 1.16 2022/01/09 05:43:00 jsg Exp $ */
 /*	$NetBSD: if_udavreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $	*/
 /*	$nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $	*/
 /*
@@ -53,8 +53,8 @@
 #define	 UDAV_NCR_WAKEEN	(1<<6) /* Wakeup Event Enable */
 #define	 UDAV_NCR_FCOL		(1<<4) /* Force Collision Mode */
 #define	 UDAV_NCR_FDX		(1<<3) /* Full-Duplex Mode (RO on Int. PHY) */
-#define	 UDAV_NCR_LBK1		(1<<2) /* Lookback Mode */
-#define	 UDAV_NCR_LBK0		(1<<1) /* Lookback Mode */
+#define	 UDAV_NCR_LBK1		(1<<2) /* Loopback Mode */
+#define	 UDAV_NCR_LBK0		(1<<1) /* Loopback Mode */
 #define	 UDAV_NCR_RST		(1<<0) /* Software reset */
 
 #define	UDAV_NSR		0x01 /* Network Status Register */
diff --git a/sys/dev/usb/if_umb.c b/sys/dev/usb/if_umb.c
index 4bba4f422ee..9cb6e267018 100644
--- a/sys/dev/usb/if_umb.c
+++ b/sys/dev/usb/if_umb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_umb.c,v 1.47 2021/09/24 05:25:37 kevlo Exp $ */
+/*	$OpenBSD: if_umb.c,v 1.48 2022/01/09 05:43:00 jsg Exp $ */
 
 /*
  * Copyright (c) 2016 genua mbH
@@ -2018,7 +2018,7 @@ umb_decode_ip_configuration(struct umb_softc *sc, void *data, int len)
 	if (len < sizeof (*ic))
 		return 0;
 	if (letoh32(ic->sessionid) != umb_session_id) {
-		DPRINTF("%s: ignore IP configration for session id %d\n",
+		DPRINTF("%s: ignore IP configuration for session id %d\n",
 		    DEVNAM(sc), letoh32(ic->sessionid));
 		return 0;
 	}
@@ -2028,7 +2028,7 @@ umb_decode_ip_configuration(struct umb_softc *sc, void *data, int len)
 	memset(sc->sc_info.ipv6dns, 0, sizeof (sc->sc_info.ipv6dns));
 
 	/*
-	 * IPv4 configuation
+	 * IPv4 configuration
 	 */
 	avail_v4 = letoh32(ic->ipv4_available);
 	if ((avail_v4 & (MBIM_IPCONF_HAS_ADDRINFO | MBIM_IPCONF_HAS_GWINFO)) ==
@@ -2092,7 +2092,7 @@ umb_decode_ip_configuration(struct umb_softc *sc, void *data, int len)
 tryv6:;
 #ifdef INET6
 	/*
-	 * IPv6 configuation
+	 * IPv6 configuration
 	 */
 	avail_v6 = letoh32(ic->ipv6_available);
 	if (avail_v6 == 0) {
@@ -3153,7 +3153,7 @@ umb_intr(struct usbd_xfer *xfer, void *priv, usbd_status status)
 		    DEVNAM(sc));
 		break;
 	default:
-		DPRINTF("%s: unexpected notifiation (0x%02x)\n",
+		DPRINTF("%s: unexpected notification (0x%02x)\n",
 		    DEVNAM(sc), sc->sc_intr_msg.bNotification);
 		break;
 	}
diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c
index eb15c659dff..dc1362d0427 100644
--- a/sys/dev/usb/if_upgt.c
+++ b/sys/dev/usb/if_upgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upgt.c,v 1.87 2020/07/31 10:49:32 mglocker Exp $ */
+/*	$OpenBSD: if_upgt.c,v 1.88 2022/01/09 05:43:00 jsg Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -1049,7 +1049,7 @@ upgt_eeprom_parse_freq3(struct upgt_softc *sc, uint8_t *data, int len)
 
 		sc->sc_eeprom_freq3[channel] = freq3[i];
 
-		DPRINTF(2, "%s: frequence=%d, channel=%d\n",
+		DPRINTF(2, "%s: frequency=%d, channel=%d\n",
 		    sc->sc_dev.dv_xname,
 		    letoh16(sc->sc_eeprom_freq3[channel].freq), channel);
 	}
@@ -1088,7 +1088,7 @@ upgt_eeprom_parse_freq4(struct upgt_softc *sc, uint8_t *data, int len)
 			sc->sc_eeprom_freq4[channel][j].pad = 0;
 		}
 
-		DPRINTF(2, "%s: frequence=%d, channel=%d\n",
+		DPRINTF(2, "%s: frequency=%d, channel=%d\n",
 		    sc->sc_dev.dv_xname,
 		    letoh16(freq4_1[i].freq), channel);
 	}
@@ -1112,7 +1112,7 @@ upgt_eeprom_parse_freq6(struct upgt_softc *sc, uint8_t *data, int len)
 
 		sc->sc_eeprom_freq6[channel] = freq6[i];
 
-		DPRINTF(2, "%s: frequence=%d, channel=%d\n",
+		DPRINTF(2, "%s: frequency=%d, channel=%d\n",
 		    sc->sc_dev.dv_xname,
 		    letoh16(sc->sc_eeprom_freq6[channel].freq), channel);
 	}
@@ -1560,7 +1560,7 @@ upgt_tx_task(void *arg)
 	}
 
 	/*
-	 * If we don't regulary read the device statistics, the RX queue
+	 * If we don't regularly read the device statistics, the RX queue
 	 * will stall.  It's strange, but it works, so we keep reading
 	 * the statistics here.  *shrug*
 	 */
diff --git a/sys/dev/usb/if_upgtvar.h b/sys/dev/usb/if_upgtvar.h
index 75ef28fd92b..bad328ca259 100644
--- a/sys/dev/usb/if_upgtvar.h
+++ b/sys/dev/usb/if_upgtvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upgtvar.h,v 1.17 2013/04/15 09:23:01 mglocker Exp $ */
+/*	$OpenBSD: if_upgtvar.h,v 1.18 2022/01/09 05:43:00 jsg Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -269,19 +269,19 @@ struct upgt_lmac_filter {
 	uint32_t			unknown4;
 } __packed;
 
-/* frequence 3 data */
+/* frequency 3 data */
 struct upgt_lmac_freq3 {
 	uint16_t			freq;
 	uint8_t				data[6];
 } __packed;
 
-/* frequence 4 data */
+/* frequency 4 data */
 struct upgt_lmac_freq4 {
 	struct upgt_eeprom_freq4_2	cmd;
 	uint8_t				pad;
 };
 
-/* frequence 6 data */
+/* frequency 6 data */
 struct upgt_lmac_freq6 {
 	uint16_t			freq;
 	uint8_t				data[8];
diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c
index 996f9122b8f..cd85d9e008e 100644
--- a/sys/dev/usb/if_urtw.c
+++ b/sys/dev/usb/if_urtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtw.c,v 1.70 2021/02/25 02:48:20 dlg Exp $	*/
+/*	$OpenBSD: if_urtw.c,v 1.71 2022/01/09 05:43:00 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@@ -664,7 +664,7 @@ urtw_attach(struct device *parent, struct device *self, void *aux)
 	error = urtw_get_txpwr(sc);
 	if (error != 0)
 		goto fail;
-	error = urtw_led_init(sc);		/* XXX incompleted */
+	error = urtw_led_init(sc);		/* XXX incomplete */
 	if (error != 0)
 		goto fail;
 
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index 6412af86dfa..5e44e6c0208 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_usb.c,v 1.75 2021/11/22 10:17:14 mglocker Exp $ */
+/*	$OpenBSD: if_wi_usb.c,v 1.76 2022/01/09 05:43:00 jsg Exp $ */
 
 /*
  * Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -1828,7 +1828,7 @@ wi_usb_tx_lock_try(struct wi_usb_softc *sc)
 
 	if (sc->wi_lock != 0) {
 		splx(s);
-		return 0; /* failed to aquire lock */
+		return 0; /* failed to acquire lock */
 	}
 
 	sc->wi_lock = 1;
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index f8d9d532825..7b2ee73c6ca 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_zyd.c,v 1.126 2021/11/22 10:17:14 mglocker Exp $	*/
+/*	$OpenBSD: if_zyd.c,v 1.127 2022/01/09 05:43:00 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -746,7 +746,7 @@ zyd_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
 }
 
 /*
- * Issue a read command for the specificed register (of size regsize)
+ * Issue a read command for the specified register (of size regsize)
  * and await a reply of olen bytes in sc->odata.
  */
 int
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index d5b50bea9ff..041e8328e9a 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci.c,v 1.163 2021/11/22 10:17:14 mglocker Exp $ */
+/*	$OpenBSD: ohci.c,v 1.164 2022/01/09 05:43:00 jsg Exp $ */
 /*	$NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
@@ -2029,7 +2029,7 @@ ohci_setaddr(struct usbd_device *dev, int addr)
 }
 
 /*
- * Close a reqular pipe.
+ * Close a regular pipe.
  * Assumes that there are no pending transactions.
  */
 void
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 6e93d6e9acf..aeeb4c6d609 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaudio.c,v 1.163 2021/12/31 23:19:50 jsg Exp $	*/
+/*	$OpenBSD: uaudio.c,v 1.164 2022/01/09 05:43:00 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Alexandre Ratchov <alex@caoua.org>
  *
@@ -772,7 +772,7 @@ uaudio_ranges_init(struct uaudio_ranges *r)
 }
 
 /*
- * Add the given range to the the uaudio_ranges structures. Ranges are
+ * Add the given range to the uaudio_ranges structures. Ranges are
  * not supposed to overlap (required by USB spec). If they do we just
  * return.
  */
diff --git a/sys/dev/usb/ucc.c b/sys/dev/usb/ucc.c
index c18257cc3bf..f23f32990bb 100644
--- a/sys/dev/usb/ucc.c
+++ b/sys/dev/usb/ucc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucc.c,v 1.28 2021/11/17 06:21:23 anton Exp $	*/
+/*	$OpenBSD: ucc.c,v 1.29 2022/01/09 05:43:00 jsg Exp $	*/
 
 /*
  * Copyright (c) 2021 Anton Lindqvist <anton@openbsd.org>
@@ -386,7 +386,7 @@ static const struct ucc_keysym ucc_keysyms[] = {
 	N(0x019F,	"AL Control Panel",				0,		0)
 	N(0x01A0,	"AL Command Line Processor/Run",		0,		0)
 	N(0x01A1,	"AL Process/Task Manager",			0,		0)
-	N(0x01A2,	"AL Select Tast/Application",			0,		0)
+	N(0x01A2,	"AL Select Task/Application",			0,		0)
 	N(0x01A3,	"AL Next Task/Application",			0,		0)
 	N(0x01A4,	"AL Previous Task/Application",			0,		0)
 	N(0x01A5,	"AL Preemptive Halt Task/Application",		0,		0)
diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c
index 735af435162..0a20c09a605 100644
--- a/sys/dev/usb/udl.c
+++ b/sys/dev/usb/udl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udl.c,v 1.96 2021/11/22 10:17:14 mglocker Exp $ */
+/*	$OpenBSD: udl.c,v 1.97 2022/01/09 05:43:00 jsg Exp $ */
 
 /*
  * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org>
@@ -1299,7 +1299,7 @@ udl_select_chip(struct udl_softc *sc)
 		/*
 		 * WS Tech DVI is DL120 or DL160. All deviced uses the
 		 * same revision (0.04) so iSerialNumber must be used
-		 * to determin which chip it is.
+		 * to determine which chip it is.
 		 */
 
 		bzero(serialnum, sizeof serialnum);
@@ -1337,7 +1337,7 @@ udl_select_chip(struct udl_softc *sc)
 		/*
 		 * SUNWEIT DVI is DL160, DL125, DL165 or DL195. Major revision
 		 * can be used to differ between DL1x0 and DL1x5. Minor to
-		 * differ between DL1x5. iSerialNumber seems not to be uniqe.
+		 * differ between DL1x5. iSerialNumber seems not to be unique.
 		 */
 
 		sc->sc_chip = DL160;
diff --git a/sys/dev/usb/ugold.c b/sys/dev/usb/ugold.c
index e90b1c54fcb..c14f4571f76 100644
--- a/sys/dev/usb/ugold.c
+++ b/sys/dev/usb/ugold.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugold.c,v 1.20 2021/11/15 15:36:24 anton Exp $   */
+/*	$OpenBSD: ugold.c,v 1.21 2022/01/09 05:43:00 jsg Exp $   */
 
 /*
  * Copyright (c) 2013 Takayoshi SASANO <uaa@openbsd.org>
@@ -19,7 +19,7 @@
  */
 
 /*
- * Driver for Microdia's HID base TEMPer and TEMPerHUM temperature and
+ * Driver for Microdia's HID based TEMPer and TEMPerHUM temperature and
  * humidity sensors
  */
 
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index a2831d9d497..51fed2c9683 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci.c,v 1.154 2021/11/22 10:17:14 mglocker Exp $	*/
+/*	$OpenBSD: uhci.c,v 1.155 2022/01/09 05:43:00 jsg Exp $	*/
 /*	$NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -1405,7 +1405,7 @@ uhci_run(struct uhci_softc *sc, int run)
  *  uhci_alloc_sqh allocates QHs
  * These two routines do their own free list management,
  * partly for speed, partly because allocating DMAable memory
- * has page size granularaity so much memory would be wasted if
+ * has page size granularity so much memory would be wasted if
  * only one TD/QH (32 bytes) was placed in each allocated chunk.
  */
 
diff --git a/sys/dev/usb/uhidpp.c b/sys/dev/usb/uhidpp.c
index e1a73a5a117..2ea376acf0b 100644
--- a/sys/dev/usb/uhidpp.c
+++ b/sys/dev/usb/uhidpp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhidpp.c,v 1.23 2021/12/23 12:14:15 anton Exp $	*/
+/*	$OpenBSD: uhidpp.c,v 1.24 2022/01/09 05:43:00 jsg Exp $	*/
 
 /*
  * Copyright (c) 2021 Anton Lindqvist <anton@openbsd.org>
@@ -559,7 +559,7 @@ uhidpp_device_connect(struct uhidpp_softc *sc, struct uhidpp_device *dev)
 
 	MUTEX_ASSERT_LOCKED(&sc->sc_mtx);
 
-	/* A connected device will continously send connect events. */
+	/* A connected device will continuously send connect events. */
 	if (dev->d_connected)
 		return;
 
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 528bbecdde7..5214fdda16d 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukbd.c,v 1.85 2021/11/22 11:29:17 anton Exp $	*/
+/*	$OpenBSD: ukbd.c,v 1.86 2022/01/09 05:43:00 jsg Exp $	*/
 /*      $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $        */
 
 /*
@@ -495,7 +495,7 @@ ukbd_cnattach(void)
 	/*
 	 * XXX USB requires too many parts of the kernel to be running
 	 * XXX in order to work, so we can't do much for the console
-	 * XXX keyboard until autconfiguration has run its course.
+	 * XXX keyboard until autoconfiguration has run its course.
 	 */
 	hidkbd_is_console = 1;
 
diff --git a/sys/dev/usb/umcs.c b/sys/dev/usb/umcs.c
index fd7427485ee..fffbf1f9416 100644
--- a/sys/dev/usb/umcs.c
+++ b/sys/dev/usb/umcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umcs.c,v 1.8 2020/07/31 10:49:33 mglocker Exp $ */
+/* $OpenBSD: umcs.c,v 1.9 2022/01/09 05:43:01 jsg Exp $ */
 /* $NetBSD: umcs.c,v 1.8 2014/08/23 21:37:56 martin Exp $ */
 /* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
 
@@ -36,7 +36,7 @@
  * Datasheets are available at MosChip www site at http://www.moschip.com.
  * The datasheets don't contain full programming information for the chip.
  *
- * It is nornal to have only two enabled ports in devices, based on quad-port
+ * It is normal to have only two enabled ports in devices, based on quad-port
  * mos7840.
  */
 
@@ -223,7 +223,7 @@ umcs_attach(struct device *parent, struct device *self, void *aux)
 
 #ifdef UMCS_DEBUG
 	if (!umcs_get_reg(sc, UMCS_MODE, &data)) {
-		printf("%s: On-die confguration: RST: active %s, "
+		printf("%s: On-die configuration: RST: active %s, "
 		    "HRD: %s, PLL: %s, POR: %s, Ports: %s, EEPROM write %s, "
 		    "IrDA is %savailable\n", DEVNAME(sc),
 		    (data & UMCS_MODE_RESET) ? "low" : "high",
@@ -410,7 +410,7 @@ umcs_set_baudrate(struct umcs_softc *sc, uint8_t portno, uint32_t rate)
 	DPRINTF("%s: portno %d set speed: %d (%02x/%d)\n", DEVNAME(sc), portno,
 	    rate, clk, div);
 
-	/* Set clock source for standard BAUD frequences */
+	/* Set clock source for standard BAUD frequencies */
 	if (umcs_get_reg(sc, spreg, &data))
 		return (EIO);
 	data &= UMCS_SPx_CLK_MASK;
@@ -436,7 +436,7 @@ umcs_set_baudrate(struct umcs_softc *sc, uint8_t portno, uint32_t rate)
 	return (0);
 }
 
-/* Maximum speeds for standard frequences, when PLL is not used */
+/* Maximum speeds for standard frequencies, when PLL is not used */
 static const uint32_t umcs_baudrate_divisors[] = {
     0, 115200, 230400, 403200, 460800, 806400, 921600, 1572864, 3145728,
 };
diff --git a/sys/dev/usb/umcs.h b/sys/dev/usb/umcs.h
index 0ad3eb91028..cd182b8e6f9 100644
--- a/sys/dev/usb/umcs.h
+++ b/sys/dev/usb/umcs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: umcs.h,v 1.3 2015/12/24 16:54:37 mmcc Exp $ */
+/* $OpenBSD: umcs.h,v 1.4 2022/01/09 05:43:01 jsg Exp $ */
 /* $NetBSD: umcs.h,v 1.1 2014/03/16 09:34:45 martin Exp $ */
 
 /*-
@@ -34,14 +34,14 @@
 
 #define	UMCS_READ_LENGTH	1	/* bytes */
 
-/* Read/Wrtire registers vendor commands */
+/* Read/Write registers vendor commands */
 #define	UMCS_READ		0x0d
 #define	UMCS_WRITE		0x0e
 
 #define	UMCS_CONFIG_NO		0
 #define	UMCS_IFACE_NO		0
 
-/* Read/Wrtie EEPROM values */
+/* Read/Write EEPROM values */
 #define	UMCS_EEPROM_RW_WVALUE	0x0900
 
 /*
@@ -106,7 +106,7 @@
 #define	UMCS_ZERO_PERIOD4	0x3d	/* Period btw frames for Port 4, R/W */
 #define	UMCS_ZERO_ENABLE	0x3e	/* Enable zero-out frames, R/W */
 
-/* Low 8 bits and high 1 bit of threshhold values for Bulk-Out ports 1-4 */
+/* Low 8 bits and high 1 bit of threshold values for Bulk-Out ports 1-4 */
 #define	UMCS_THR_VAL_LOW1	0x3f
 #define	UMCS_THR_VAL_HIGH1	0x40
 #define	UMCS_THR_VAL_LOW2	0x41
@@ -119,14 +119,14 @@
 				    
 /* Bits for SPx registers */
 #define	UMCS_SPx_LOOP_PIPES	0x01	/* Loop Out FIFO to In FIFO */
-#define	UMCS_SPx_SKIP_ERR_DATA	0x02	/* Drop data recevied with errors */
+#define	UMCS_SPx_SKIP_ERR_DATA	0x02	/* Drop data received with errors */
 #define	UMCS_SPx_RESET_OUT_FIFO	0x04	/* Reset Bulk-Out FIFO */
 #define	UMCS_SPx_RESET_IN_FIFO	0x08	/* Reset Bulk-In FIFO */
 #define	UMCS_SPx_CLK_MASK	0x70	/* Mask to extract Baud CLK source */
 #define	UMCS_SPx_CLK_X1		0x00	/* Max speed = 115200 bps, default */
 #define	UMCS_SPx_CLK_X2		0x10	/* Max speed = 230400 bps */
 #define	UMCS_SPx_CLK_X35	0x20	/* Max speed = 403200 bps */
-#define	UMCS_SPx_CLK_X4		0x30	/* Nax speed = 460800 bps */
+#define	UMCS_SPx_CLK_X4		0x30	/* Max speed = 460800 bps */
 #define	UMCS_SPx_CLK_X7		0x40	/* Max speed = 806400 bps */
 #define	UMCS_SPx_CLK_X8		0x50	/* Max speed = 921600 bps */
 #define	UMCS_SPx_CLK_24MHZ	0x60	/* Max speed = 1.5Mbps */
@@ -169,7 +169,7 @@
 #define	UMCS_GPIO_GPIO_1	0x02	/* GPIO_1 data */
 
 /*
- * Constants for PLL dividers.  Ouptut frequency of PLL is:
+ * Constants for PLL dividers.  Output frequency of PLL is:
  *   Fout = (N/M) * Fin.
  * Default PLL input frequency Fin is 12Mhz (on-chip).
  */
@@ -208,7 +208,7 @@
 #define	UMCS_CLK_SELECT3_SHIFT	0	/* Shift for port 3 in CLK_SELECT23 */
 #define	UMCS_CLK_SELECT4_MASK	0x38	/* Bits for port 4 in CLK_SELECT23 */
 #define	UMCS_CLK_SELECT4_SHIFT	3	/* Shift for port 4 in CLK_SELECT23 */
-#define	UMCS_CLK_SELECT_STD	0x00	/* STANDARD rate devired from 96Mhz */
+#define	UMCS_CLK_SELECT_STD	0x00	/* STANDARD rate derived from 96Mhz */
 #define	UMCS_CLK_SELECT_30MHZ	0x01	/* 30Mhz */
 #define	UMCS_CLK_SELECT_96MHZ	0x02	/* 96Mhz direct */
 #define	UMCS_CLK_SELECT_120MHZ	0x03	/* 120Mhz */
@@ -249,7 +249,7 @@
 #define	UMCS_RX_SAMPLINGx_DEF	7	/* Default for any RX Sampling */
 #define	UMCS_RX_SAMPLINGx_MAX	15	/* Min for any RX Sampling */
 
-/* Number of Bulk-in requests befor sending zero-sized reply */
+/* Number of Bulk-in requests before sending zero-sized reply */
 #define	UMCS_ZERO_PERIODx_DEF	20
 
 
@@ -282,18 +282,18 @@
 
 
 /* Bits of DCR0 registers, documented in datasheet */
-#define	UMCS_DCR0_PWRSAVE	0x01	/* Transiver off when USB Suspend */
+#define	UMCS_DCR0_PWRSAVE	0x01	/* Transceiver off when USB Suspended */
 #define	UMCS_DCR0_RESERVED1	0x02	/* Unused */
 #define	UMCS_DCR0_GPIO_MASK	0x0c	/* GPIO Mode bits */
 #define	UMCS_DCR0_GPIO_IN	0x00	/* GPIO Mode - Input (0b00) */
 #define	UMCS_DCR0_GPIO_OUT	0x08	/* GPIO Mode - Input (0b10) */ 
-#define	UMCS_DCR0_RTS_ACTHI	0x10	/* RTS Active is Hight, (default low) */
+#define	UMCS_DCR0_RTS_ACTHI	0x10	/* RTS Active is High, (default low) */
 #define	UMCS_DCR0_RTS_AUTO	0x20	/* Control by state TX buffer or MCR */
 #define	UMCS_DCR0_IRDA		0x40	/* IrDA mode */
 #define	UMCS_DCR0_RESERVED2	0x80	/* Unused */
 
 /* Bits of DCR1 registers, documented in datasheet, work only for port 1. */
-#define	UMCS_DCR1_GPIO_CURRENT_MASK	0x03	/* Mask to get GPIO valule */
+#define	UMCS_DCR1_GPIO_CURRENT_MASK	0x03	/* Mask to get GPIO value */
 #define	UMCS_DCR1_GPIO_CURRENT_6MA	0x00	/* GPIO output current 6mA */
 #define	UMCS_DCR1_GPIO_CURRENT_8MA	0x01	/* GPIO output current 8mA */
 #define	UMCS_DCR1_GPIO_CURRENT_10MA	0x02	/* GPIO output current 10mA */
@@ -329,7 +329,7 @@
 #define	UMCS_REG_RHR		0x00	/* Receiver Holding Register R */
 #define	UMCS_REG_IER		0x01	/* Interrupt enable register - R/W */
 #define	UMCS_REG_FCR		0x02	/* FIFO Control register - W */
-#define	UMCS_REG_ISR		0x02	/* Interrupt Status Registter R */
+#define	UMCS_REG_ISR		0x02	/* Interrupt Status Register R */
 #define	UMCS_REG_LCR		0x03	/* Line control register R/W */
 #define	UMCS_REG_MCR		0x04	/* Modem control register R/W */
 #define	UMCS_REG_LSR		0x05	/* Line status register R */
@@ -340,9 +340,9 @@
 #define	UMCS_REG_DLM		0x01	/* High bits of BAUD divider */
 
 /* IER bits */
-#define	UMCS_IER_RXREADY	0x01	/* RX Ready interrumpt mask */
-#define	UMCS_IER_TXREADY	0x02	/* TX Ready interrumpt mask */
-#define	UMCS_IER_RXSTAT		0x04	/* RX Status interrumpt mask */
+#define	UMCS_IER_RXREADY	0x01	/* RX Ready interrupt mask */
+#define	UMCS_IER_TXREADY	0x02	/* TX Ready interrupt mask */
+#define	UMCS_IER_RXSTAT		0x04	/* RX Status interrupt mask */
 #define	UMCS_IER_MODEM		0x08	/* Modem status change interrupt mask */
 #define	UMCS_IER_SLEEP		0x10	/* SLEEP enable */
 
@@ -359,9 +359,9 @@
 /* ISR bits */
 #define	UMCS_ISR_NOPENDING	0x01	/* No interrupt pending */
 #define	UMCS_ISR_INTMASK	0x3f	/* Mask to select interrupt source */
-#define	UMCS_ISR_RXERR		0x06	/* Recevir error */
-#define	UMCS_ISR_RXHASDATA	0x04	/* Recevier has data */
-#define	UMCS_ISR_RXTIMEOUT	0x0c	/* Recevier timeout */
+#define	UMCS_ISR_RXERR		0x06	/* Receiver error */
+#define	UMCS_ISR_RXHASDATA	0x04	/* Receiver has data */
+#define	UMCS_ISR_RXTIMEOUT	0x0c	/* Receiver timeout */
 #define	UMCS_ISR_TXEMPTY	0x02	/* Transmitter empty */
 #define	UMCS_ISR_MSCHANGE	0x00	/* Modem status change */
 
diff --git a/sys/dev/usb/umidivar.h b/sys/dev/usb/umidivar.h
index 116d7564013..841e9e062d1 100644
--- a/sys/dev/usb/umidivar.h
+++ b/sys/dev/usb/umidivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umidivar.h,v 1.16 2013/11/10 10:22:39 pirofti Exp $ */
+/*	$OpenBSD: umidivar.h,v 1.17 2022/01/09 05:43:01 jsg Exp $ */
 /*	$NetBSD: umidivar.h,v 1.5 2002/09/12 21:00:42 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@ struct umidi_packet {
 };
 
 /*
- * hierarchie
+ * hierarchy
  *
  * <-- parent	       child -->
  *
diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index 3c613bdafcb..50d92171214 100644
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umsm.c,v 1.119 2021/05/18 14:23:03 kevlo Exp $	*/
+/*	$OpenBSD: umsm.c,v 1.120 2022/01/09 05:43:01 jsg Exp $	*/
 
 /*
  * Copyright (c) 2008 Yojiro UO <yuo@nui.org>
@@ -757,7 +757,7 @@ umsm_umass_changemode(struct umsm_softc *sc)
 			target_ep = ed->bEndpointAddress;
 	}
 
-	/* open command endppoint */
+	/* open command endpoint */
 	err = usbd_open_pipe(sc->sc_iface, target_ep,
 		USBD_EXCLUSIVE_USE, &cmdpipe);
 	if (err) {
diff --git a/sys/dev/usb/uoak.h b/sys/dev/usb/uoak.h
index b58daf74c9d..789cef98e6a 100644
--- a/sys/dev/usb/uoak.h
+++ b/sys/dev/usb/uoak.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uoak.h,v 1.3 2013/04/15 09:23:02 mglocker Exp $   */
+/*	$OpenBSD: uoak.h,v 1.4 2022/01/09 05:43:01 jsg Exp $   */
 
 /*
  * Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -16,10 +16,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* TORADEX OAK seriese sensors */
+/* TORADEX OAK series sensors */
 /* http://developer.toradex.com/files/toradex-dev/uploads/media/Oak/Oak_ProgrammingGuide.pdf */
 
-/* feture request direction */
+/* feature request direction */
 #define OAK_SET			0x0
 #define OAK_GET			0x1
 
diff --git a/sys/dev/usb/uoak_subr.c b/sys/dev/usb/uoak_subr.c
index 6dfd5e8b292..c6d16240ae6 100644
--- a/sys/dev/usb/uoak_subr.c
+++ b/sys/dev/usb/uoak_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uoak_subr.c,v 1.9 2018/05/01 18:14:46 landry Exp $   */
+/*	$OpenBSD: uoak_subr.c,v 1.10 2022/01/09 05:43:01 jsg Exp $   */
 
 /*
  * Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* TORADEX OAK seriese sensors: common functions */ 
+/* TORADEX OAK series sensors: common functions */ 
 /* http://developer.toradex.com/files/toradex-dev/uploads/media/Oak/Oak_ProgrammingGuide.pdf */
 
 #include <sys/param.h>
@@ -40,7 +40,7 @@
  *  basic procedure to issue command to the OAK device.
  *  1) check the device is ready to accept command.
  *     if a report of a FEATURE_REPORT request is not start 0xff,
- *     wait for a while, and retry till the reponse start with 0xff.
+ *     wait for a while, and retry till the response start with 0xff.
  *  2) issue command.  (set or get)
  *  3) if the command will response, wait for a while, and issue
  *     FEATURE_REPORT. leading 0xff indicate the response is valid.
@@ -245,7 +245,7 @@ uoak_get_setting(struct uoak_softc *sc, enum uoak_target target)
 	(void)uoak_get_sample_rate(sc, target);
 	(void)uoak_get_report_rate(sc, target);
 
-	/* get device spcecific information */
+	/* get device specific information */
 	if (sc->sc_methods->dev_setting != NULL)
 		sc->sc_methods->dev_setting(sc->sc_parent, target);
 }
@@ -276,7 +276,7 @@ uoak_print_setting(struct uoak_softc *sc, enum uoak_target target)
 		break;
 	}
 
-	/* print device spcecific information */
+	/* print device specific information */
 	if (sc->sc_methods->dev_print != NULL)
 		sc->sc_methods->dev_print(sc->sc_parent, target);
 	printf("\n");
diff --git a/sys/dev/usb/uoaklux.c b/sys/dev/usb/uoaklux.c
index cde56d5b2ea..d04fd5c5823 100644
--- a/sys/dev/usb/uoaklux.c
+++ b/sys/dev/usb/uoaklux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uoaklux.c,v 1.15 2021/11/15 15:36:24 anton Exp $   */
+/*	$OpenBSD: uoaklux.c,v 1.16 2022/01/09 05:43:01 jsg Exp $   */
 
 /*
  * Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* TORADEX OAK seriese sensors: lux sensor driver */
+/* TORADEX OAK series sensors: lux sensor driver */
 /* http://developer.toradex.com/files/toradex-dev/uploads/media/Oak/Oak_ProgrammingGuide.pdf */
 
 #include <sys/param.h>
diff --git a/sys/dev/usb/uoakrh.c b/sys/dev/usb/uoakrh.c
index beb324eb7c0..0257f4ee368 100644
--- a/sys/dev/usb/uoakrh.c
+++ b/sys/dev/usb/uoakrh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uoakrh.c,v 1.17 2021/11/15 15:36:24 anton Exp $   */
+/*	$OpenBSD: uoakrh.c,v 1.18 2022/01/09 05:43:01 jsg Exp $   */
 
 /*
  * Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* TORADEX OAK seriese sensors: Temperature/Humidity sensor driver */
+/* TORADEX OAK series sensors: Temperature/Humidity sensor driver */
 /* http://developer.toradex.com/files/toradex-dev/uploads/media/Oak/Oak_ProgrammingGuide.pdf */
 
 #include <sys/param.h>
diff --git a/sys/dev/usb/uoakv.c b/sys/dev/usb/uoakv.c
index 72588c49042..011f5c858aa 100644
--- a/sys/dev/usb/uoakv.c
+++ b/sys/dev/usb/uoakv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uoakv.c,v 1.15 2021/11/15 15:36:24 anton Exp $   */
+/*	$OpenBSD: uoakv.c,v 1.16 2022/01/09 05:43:02 jsg Exp $   */
 
 /*
  * Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* TORADEX OAK seriese sensors: 8channel +/-10V ADC driver */
+/* TORADEX OAK series sensors: 8channel +/-10V ADC driver */
 /* http://developer.toradex.com/files/toradex-dev/uploads/media/Oak/Oak_ProgrammingGuide.pdf */
 
 #include <sys/param.h>
@@ -326,8 +326,8 @@ uoakv_dev_print(void *parent, enum uoak_target target)
 	struct uoakv_softc *sc = (struct uoakv_softc *)parent;
 	int i;
 
-	printf(", %s",
-	    (sc->sc_inputmode[target] ? "Psuedo-Diffential" : "Single-Ended"));
+	printf(", %s", (sc->sc_inputmode[target] ?
+	    "Pseudo-Differential" : "Single-Ended"));
 
 	printf(", ADC channel offsets:\n");
 	printf("%s: ", sc->sc_hdev.sc_dev.dv_xname);
diff --git a/sys/dev/usb/uonerng.c b/sys/dev/usb/uonerng.c
index 890e765b5f4..31f008b591b 100644
--- a/sys/dev/usb/uonerng.c
+++ b/sys/dev/usb/uonerng.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uonerng.c,v 1.5 2020/05/29 04:42:25 deraadt Exp $ */
+/*	$OpenBSD: uonerng.c,v 1.6 2022/01/09 05:43:02 jsg Exp $ */
 /*
  * Copyright (C) 2015 Devin Reade <gdr@gno.org>
  * Copyright (C) 2015 Sean Levy <attila@stalphonsos.com>
@@ -81,7 +81,7 @@
 #define ONERNG_OP_EXTRACT_FIRMWARE "cmdX\n"
 
 /*
- * Noise sources include an avalache circuit and an RF circuit.
+ * Noise sources include an avalanche circuit and an RF circuit.
  * There is also a whitener to provide a uniform distribution.
  * Different combinations are possible.
  */
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 12c57c85587..ad5246507ee 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.128 2021/09/05 16:16:13 mglocker Exp $	*/
+/*	$OpenBSD: usb.c,v 1.129 2022/01/09 05:43:02 jsg Exp $	*/
 /*	$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $	*/
 
 /*
@@ -807,7 +807,7 @@ usb_explore(void *v)
 	if (sc->sc_bus->flags & USB_BUS_CONFIG_PENDING) {
 		/*
 		 * If this is a low/full speed hub and there is a high
-		 * speed hub that hasn't explored yet, reshedule this
+		 * speed hub that hasn't explored yet, reschedule this
 		 * task, allowing the high speed explore task to run.
 		 */
 		if (sc->sc_bus->usbrev < USBREV_2_0 && explore_pending > 0) {
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 798bb96f350..7d8480f0f01 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_subr.c,v 1.156 2021/12/04 07:01:59 anton Exp $ */
+/*	$OpenBSD: usb_subr.c,v 1.157 2022/01/09 05:43:02 jsg Exp $ */
 /*	$NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
@@ -393,7 +393,7 @@ usbd_reset_port(struct usbd_device *dev, int port)
 			return (0);
 	} while ((UGETW(ps.wPortChange) & UPS_C_PORT_RESET) == 0 && --n > 0);
 
-	/* Clear port reset even if a timeout occured. */
+	/* Clear port reset even if a timeout occurred. */
 	if (usbd_clear_port_feature(dev, port, UHF_C_PORT_RESET)) {
 		DPRINTF(("%s: clear port feature failed\n", __func__));
 		return (EIO);
@@ -1094,7 +1094,7 @@ usbd_new_device(struct device *parent, struct usbd_bus *bus, int depth,
 	/* Try to get device descriptor */
 	/* 
 	 * some device will need small size query at first (XXX: out of spec)
-	 * we will get full size descriptor later, just determin the maximum
+	 * we will get full size descriptor later, just determine the maximum
 	 * packet size of the control pipe at this moment.
 	 */
 	for (i = 0; i < 3; i++) {
diff --git a/sys/dev/usb/usbcdc.h b/sys/dev/usb/usbcdc.h
index c70ecfcc162..1ac2a35640a 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/dev/usb/usbcdc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbcdc.h,v 1.9 2013/04/15 09:23:02 mglocker Exp $ */
+/*	$OpenBSD: usbcdc.h,v 1.10 2022/01/09 05:43:02 jsg Exp $ */
 /*	$NetBSD: usbcdc.h,v 1.8 2001/02/16 20:15:57 kenh Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbcdc.h,v 1.7 1999/11/17 22:33:48 n_hibma Exp $	*/
 
@@ -165,7 +165,7 @@ struct usb_cdc_connection_speed {
 #define UCDC_CONNECTION_SPEED_LENGTH 8
 
 /*
- * Bits set in the SERIAL STATE notifcation (first byte of data)
+ * Bits set in the SERIAL STATE notification (first byte of data)
  */
 
 #define UCDC_N_SERIAL_OVERRUN		0x40
diff --git a/sys/dev/usb/uthum.c b/sys/dev/usb/uthum.c
index e1a288645ed..7888ee8b2c5 100644
--- a/sys/dev/usb/uthum.c
+++ b/sys/dev/usb/uthum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uthum.c,v 1.37 2021/11/15 15:36:24 anton Exp $   */
+/*	$OpenBSD: uthum.c,v 1.38 2022/01/09 05:43:02 jsg Exp $   */
 
 /*
  * Copyright (c) 2009, 2010 Yojiro UO <yuo@nui.org>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Driver for HID base TEMPer seriese Temperature(/Humidity) sensors */
+/* Driver for HID based TEMPer series Temperature(/Humidity) sensors */
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/utpms.c b/sys/dev/usb/utpms.c
index 944431eb141..27acdb6a58c 100644
--- a/sys/dev/usb/utpms.c
+++ b/sys/dev/usb/utpms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utpms.c,v 1.12 2021/11/22 11:29:18 anton Exp $	*/
+/*	$OpenBSD: utpms.c,v 1.13 2022/01/09 05:43:02 jsg Exp $	*/
 
 /*
  * Copyright (c) 2005, Johan Wallén
@@ -510,7 +510,7 @@ reorder_sample(struct utpms_softc *sc, unsigned char *to, unsigned char *from)
 			to[i + 16] = from[5 * i + 42];
 #if 0
 			/*
-			 * XXX This seems to introduce random ventical jumps,
+			 * XXX This seems to introduce random vertical jumps,
 			 * so we ignore these sensors until we figure out
 			 * their meaning.
 			 */
diff --git a/sys/dev/usb/utrh.c b/sys/dev/usb/utrh.c
index 32badfc9c2b..a77f2ed8e1f 100644
--- a/sys/dev/usb/utrh.c
+++ b/sys/dev/usb/utrh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utrh.c,v 1.25 2021/11/15 15:36:24 anton Exp $   */
+/*	$OpenBSD: utrh.c,v 1.26 2022/01/09 05:43:02 jsg Exp $   */
 
 /*
  * Copyright (c) 2009 Yojiro UO <yuo@nui.org>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Driver for Strawberry linux USBRH Temerature/Humidity sensor */
+/* Driver for Strawberry linux USBRH Temperature/Humidity sensor */
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index 1c33f72cca1..595da2844b8 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvideo.c,v 1.214 2021/11/22 10:17:14 mglocker Exp $ */
+/*	$OpenBSD: uvideo.c,v 1.215 2022/01/09 05:43:02 jsg Exp $ */
 
 /*
  * Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -3147,7 +3147,7 @@ uvideo_s_fmt(void *v, struct v4l2_format *fmt)
 	/*
 	 * Do negotiation.
 	 */
-	/* save a copy of current fromat group in case of negotiation fails */
+	/* save a copy of current format group in case of negotiation fails */
 	fmtgrp_save = sc->sc_fmtgrp_cur;
 	frame_save = sc->sc_fmtgrp_cur->frame_cur;
 	/* set new format group */
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index 65cd2d67e80..eb55fa12210 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvscom.c,v 1.39 2020/07/31 10:49:33 mglocker Exp $ */
+/*	$OpenBSD: uvscom.c,v 1.40 2022/01/09 05:43:02 jsg Exp $ */
 /*	$NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $	*/
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
@@ -676,7 +676,7 @@ uvscom_open(void *addr, int portno)
 
 		err = uvscom_readstat(sc);
 		if (err) {
-			DPRINTF(("%s: uvscom_open: readstat faild\n",
+			DPRINTF(("%s: uvscom_open: readstat failed\n",
 				 sc->sc_dev.dv_xname));
 			return (EIO);
 		}
diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c
index bf52be001bc..71958b064a1 100644
--- a/sys/dev/usb/xhci.c
+++ b/sys/dev/usb/xhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xhci.c,v 1.123 2021/11/22 10:17:14 mglocker Exp $ */
+/* $OpenBSD: xhci.c,v 1.124 2022/01/09 05:43:02 jsg Exp $ */
 
 /*
  * Copyright (c) 2014-2015 Martin Pieuchot
@@ -1206,7 +1206,7 @@ xhci_pipe_open(struct usbd_pipe *pipe)
 		/*
 		 * Get a slot and init the device's contexts.
 		 *
-		 * Since the control enpoint, represented as the default
+		 * Since the control endpoint, represented as the default
 		 * pipe, is always opened first we are dealing with a
 		 * new device.  Put a new slot in the ENABLED state.
 		 *
@@ -1443,7 +1443,7 @@ xhci_context_setup(struct xhci_softc *sc, struct usbd_pipe *pipe)
 	    DEQPTR(xp->ring) | xp->ring.toggle
 	);
 
-	/* Unmask the new endoint */
+	/* Unmask the new endpoint */
 	sdev->input_ctx->drop_flags = 0;
 	sdev->input_ctx->add_flags = htole32(XHCI_INCTX_MASK_DCI(xp->dci));
 
diff --git a/sys/dev/usb/xhcireg.h b/sys/dev/usb/xhcireg.h
index 371a4e302be..41535c36737 100644
--- a/sys/dev/usb/xhcireg.h
+++ b/sys/dev/usb/xhcireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xhcireg.h,v 1.17 2019/10/15 03:31:35 visa Exp $ */
+/* $OpenBSD: xhcireg.h,v 1.18 2022/01/09 05:43:02 jsg Exp $ */
 
 /*-
  * Copyright (c) 2014 Martin Pieuchot. All rights reserved.
@@ -91,10 +91,10 @@
 #define  XHCI_HCC_LHRC(x)	(((x) >> 5) & 0x1) /* Light HC reset */
 #define  XHCI_HCC_LTC(x)	(((x) >> 6) & 0x1) /* Latency tolerance msg */
 #define  XHCI_HCC_NSS(x)	(((x) >> 7) & 0x1) /* No secondary sid */
-#define  XHCI_HCC_PAE(x)	(((x) >> 8) & 0x1) /* Pase All Event Data */
+#define  XHCI_HCC_PAE(x)	(((x) >> 8) & 0x1) /* Parse All Event Data */
 #define  XHCI_HCC_SPC(x)	(((x) >> 9) & 0x1) /* Short packet */
 #define  XHCI_HCC_SEC(x)	(((x) >> 10) & 0x1) /* Stopped EDTLA */
-#define  XHCI_HCC_CFC(x)	(((x) >> 11) & 0x1) /* Configuous Frame ID */
+#define  XHCI_HCC_CFC(x)	(((x) >> 11) & 0x1) /* Contiguous Frame ID */
 #define  XHCI_HCC_MAX_PSA_SZ(x)	(((x) >> 12) & 0xf) /* Max pri. stream arr. */
 #define  XHCI_HCC_XECP(x)	(((x) >> 16) & 0xffff) /* Ext. capabilities */
 
@@ -185,7 +185,7 @@
 #define XHCI_PM3_U2TO(x)	(((x) & 0xff) << 8)	/* RW - U2 timeout */
 #define XHCI_PM3_FLA		0x00010000 /* RW - Force Link PM Accept */
 #define XHCI_PM2_L1S(x)		(((x) >> 0) & 0x7)	/* RO - L1 status */
-#define XHCI_PM2_RWE		0x00000008 /* RW - remote wakup enable */
+#define XHCI_PM2_RWE		0x00000008 /* RW - remote wakeup enable */
 #define XHCI_PM2_HIRD(x)	(((x) & 0xf) << 4)  /* RW - resume duration */
 #define XHCI_PM2_L1SLOT(x)	(((x) & 0xff) << 8) /* RW - L1 device slot */
 #define XHCI_PM2_HLE		0x00010000	/* RW - hardware LPM enable */
@@ -397,9 +397,9 @@ struct xhci_trb {
 #define XHCI_CMD_SET_TR_DEQ	(16 << 10)
 #define XHCI_CMD_RESET_DEV	(17 << 10)
 #define XHCI_CMD_FEVENT		(18 << 10)
-#define XHCI_CMD_NEG_BW		(19 << 10)	/* Negociate bandwith */
+#define XHCI_CMD_NEG_BW		(19 << 10)	/* Negotiate bandwidth */
 #define XHCI_CMD_SET_LT  	(20 << 10)	/* Set latency tolerance */
-#define XHCI_CMD_GET_BW		(21 << 10)	/* Get port bandwith */
+#define XHCI_CMD_GET_BW		(21 << 10)	/* Get port bandwidth */
 #define XHCI_CMD_FHEADER	(22 << 10)
 #define XHCI_CMD_NOOP		(23 << 10)	/* To test the command ring */
 
@@ -426,7 +426,7 @@ struct xhci_trb {
 #define XHCI_CODE_NO_SLOTS	 9	/* MaxSlots limit reached */
 #define XHCI_CODE_STREAM_TYPE	10	/* Stream Context Type value detected */
 #define XHCI_CODE_SLOT_NOT_ON	11	/* Related device slot is disabled */
-#define XHCI_CODE_ENDP_NOT_ON	12	/* Related enpoint is disabled */
+#define XHCI_CODE_ENDP_NOT_ON	12	/* Related endpoint is disabled */
 #define XHCI_CODE_SHORT_XFER	13	/* Short packet */
 #define XHCI_CODE_RING_UNDERRUN	14	/* Empty ring when transmitting isoc */
 #define XHCI_CODE_RING_OVERRUN	15	/* Empty ring when receiving isoc */