put opening { on same line as struct name

ok claudio@

23 files changed, 63 insertions, 103 deletions

diff --git a/sys/arch/amd64/amd64/mpbios.c b/sys/arch/amd64/amd64/mpbios.c
index 07df036ed84..96a13535d66 100644
--- a/sys/arch/amd64/amd64/mpbios.c
+++ b/sys/arch/amd64/amd64/mpbios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpbios.c,v 1.32 2024/06/07 23:19:18 jsg Exp $	*/
+/*	$OpenBSD: mpbios.c,v 1.33 2024/10/22 21:50:02 jsg Exp $	*/
 /*	$NetBSD: mpbios.c,v 1.7 2003/05/15 16:32:50 fvdl Exp $	*/
 
 /*-
@@ -134,8 +134,7 @@ static const char *loc_where[] = {
 	"bios"
 };
 
-struct mp_map
-{
+struct mp_map {
 	vaddr_t		baseva;
 	int		vsize;
 	paddr_t		pa;
diff --git a/sys/arch/amd64/include/i82093var.h b/sys/arch/amd64/include/i82093var.h
index 6d5c168618b..640e3c07405 100644
--- a/sys/arch/amd64/include/i82093var.h
+++ b/sys/arch/amd64/include/i82093var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82093var.h,v 1.6 2024/05/22 05:51:49 jsg Exp $	*/
+/*	$OpenBSD: i82093var.h,v 1.7 2024/10/22 21:50:02 jsg Exp $	*/
 /* $NetBSD: i82093var.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */
 
 /*-
@@ -37,8 +37,7 @@
 
 #include <machine/apicvar.h>
 
-struct ioapic_pin 
-{
+struct ioapic_pin {
 	struct ioapic_pin	*ip_next;	/* next pin on this vector */
 	struct mp_intr_map 	*ip_map;
 	int			ip_vector;	/* IDT vector */
diff --git a/sys/arch/amd64/include/vmmvar.h b/sys/arch/amd64/include/vmmvar.h
index a2c9d5db449..cd04fe4f07b 100644
--- a/sys/arch/amd64/include/vmmvar.h
+++ b/sys/arch/amd64/include/vmmvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmmvar.h,v 1.108 2024/10/02 17:05:56 dv Exp $	*/
+/*	$OpenBSD: vmmvar.h,v 1.109 2024/10/22 21:50:02 jsg Exp $	*/
 /*
  * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
  *
@@ -727,20 +727,17 @@ struct vmcs {
 	uint32_t	vmcs_revision;
 };
 
-struct vmx_invvpid_descriptor
-{
+struct vmx_invvpid_descriptor {
 	uint64_t	vid_vpid;
 	uint64_t	vid_addr;
 };
 
-struct vmx_invept_descriptor
-{
+struct vmx_invept_descriptor {
 	uint64_t	vid_eptp;
 	uint64_t	vid_reserved;
 };
 
-struct vmx_msr_store
-{
+struct vmx_msr_store {
 	uint64_t	vms_index;
 	uint64_t	vms_data;
 };
@@ -752,8 +749,7 @@ struct vmx_msr_store
  * Note that vmx/svm_enter_guest depend on the layout of this struct for
  * field access.
  */
-struct vcpu_gueststate
-{
+struct vcpu_gueststate {
 	/* %rsi should be first */
 	uint64_t	vg_rsi;			/* 0x00 */
 	uint64_t	vg_rax;			/* 0x08 */
diff --git a/sys/arch/i386/i386/mpbios.c b/sys/arch/i386/i386/mpbios.c
index 1775fb8ad1a..9c7511cab15 100644
--- a/sys/arch/i386/i386/mpbios.c
+++ b/sys/arch/i386/i386/mpbios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpbios.c,v 1.47 2024/06/07 23:19:18 jsg Exp $	*/
+/*	$OpenBSD: mpbios.c,v 1.48 2024/10/22 21:50:02 jsg Exp $	*/
 /*	$NetBSD: mpbios.c,v 1.2 2002/10/01 12:56:57 fvdl Exp $	*/
 
 /*-
@@ -141,8 +141,7 @@ static const char *loc_where[] = {
 	"bios"
 };
 
-struct mp_map
-{
+struct mp_map {
 	vaddr_t 	baseva;
 	int	 	vsize;
 	paddr_t 	pa;
diff --git a/sys/arch/i386/include/i82093var.h b/sys/arch/i386/include/i82093var.h
index fd86a6e4bc2..42e9aa50533 100644
--- a/sys/arch/i386/include/i82093var.h
+++ b/sys/arch/i386/include/i82093var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82093var.h,v 1.12 2024/05/22 05:51:49 jsg Exp $	*/
+/*	$OpenBSD: i82093var.h,v 1.13 2024/10/22 21:50:02 jsg Exp $	*/
 /* $NetBSD: i82093var.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */
 
 /*-
@@ -37,8 +37,7 @@
 
 #include <machine/apicvar.h>
 
-struct ioapic_pin 
-{
+struct ioapic_pin {
 	struct intrhand		*ip_handler; 
 	struct ioapic_pin	*ip_next; /* next pin on this vector */
 	struct mp_intr_map 	*ip_map;
diff --git a/sys/arch/i386/include/mpbiosvar.h b/sys/arch/i386/include/mpbiosvar.h
index b22fbd823f9..1383c49f298 100644
--- a/sys/arch/i386/include/mpbiosvar.h
+++ b/sys/arch/i386/include/mpbiosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpbiosvar.h,v 1.12 2016/05/18 03:45:11 mlarkin Exp $	*/
+/*	$OpenBSD: mpbiosvar.h,v 1.13 2024/10/22 21:50:02 jsg Exp $	*/
 /* $NetBSD: mpbiosvar.h,v 1.1.2.3 2000/02/29 13:17:20 sommerfeld Exp $ */
 
 /*-
@@ -43,8 +43,7 @@
 
 #include <machine/mpbiosreg.h>
 
-struct mp_bus 
-{
+struct mp_bus {
 	char *mb_name;		/* XXX bus name */
 	int mb_idx;		/* XXX bus index */
 	void (*mb_intr_print) (int);
@@ -53,8 +52,7 @@ struct mp_bus
 	u_int32_t mb_data;	/* random bus-specific datum. */
 };
 
-struct mp_intr_map
-{
+struct mp_intr_map {
 	struct mp_intr_map *next;
 	struct mp_bus *bus;
 	int bus_pin;
diff --git a/sys/arch/luna88k/luna88k/autoconf.c b/sys/arch/luna88k/luna88k/autoconf.c
index 5b6cef86b62..3f5cdae0e73 100644
--- a/sys/arch/luna88k/luna88k/autoconf.c
+++ b/sys/arch/luna88k/luna88k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.29 2022/12/10 02:41:56 aoyama Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.30 2024/10/22 21:50:02 jsg Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -105,8 +105,7 @@ diskconf(void)
  *
  * XXX Right now we can not handle network boot.
  */
-struct autoboot_t
-{
+struct autoboot_t {
 	char	cont[16];
 	int	targ;
 	int	part;
diff --git a/sys/arch/m88k/include/pcb.h b/sys/arch/m88k/include/pcb.h
index 26a81398185..9dfaabe2039 100644
--- a/sys/arch/m88k/include/pcb.h
+++ b/sys/arch/m88k/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.8 2015/10/05 01:22:34 deraadt Exp $ */
+/*	$OpenBSD: pcb.h,v 1.9 2024/10/22 21:50:02 jsg Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Mach Operating System
@@ -73,8 +73,7 @@ struct m88100_pcb {
 	unsigned long pcb_fcr63;
 };
 
-struct pcb
-{
+struct pcb {
 	struct m88100_pcb	kernel_state;
 	struct trapframe	user_state;
 	int			pcb_onfault;
diff --git a/sys/arch/macppc/dev/pm_direct.h b/sys/arch/macppc/dev/pm_direct.h
index 21563fc71fc..9f1a5a3038d 100644
--- a/sys/arch/macppc/dev/pm_direct.h
+++ b/sys/arch/macppc/dev/pm_direct.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pm_direct.h,v 1.16 2023/11/22 18:14:35 tobhe Exp $	*/
+/*	$OpenBSD: pm_direct.h,v 1.17 2024/10/22 21:50:02 jsg Exp $	*/
 /*	$NetBSD: pm_direct.h,v 1.7 2005/01/07 04:59:58 briggs Exp $	*/
 
 /*
@@ -57,8 +57,7 @@ void	pm_intr(void);
 void	pm_read_date_time(time_t *);
 void	pm_set_date_time(time_t);
 
-struct pmu_battery_info
-{
+struct pmu_battery_info {
 	unsigned int flags;
 	unsigned int cur_charge;
 	unsigned int max_charge;
diff --git a/sys/dev/acpi/acpicpu.c b/sys/dev/acpi/acpicpu.c
index f46ff68a860..03fe5bef0a7 100644
--- a/sys/dev/acpi/acpicpu.c
+++ b/sys/dev/acpi/acpicpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpicpu.c,v 1.94 2024/07/14 14:04:16 jmatthew Exp $ */
+/* $OpenBSD: acpicpu.c,v 1.95 2024/10/22 21:50:02 jsg Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
@@ -101,8 +101,7 @@ void	acpicpu_setperf_ppc_change(struct acpicpu_pss *, int);
 /* Make sure throttling bits are valid,a=addr,o=offset,w=width */
 #define valid_throttle(o,w,a)	(a && w && (o+w)<=31 && (o>4 || (o+w)<=4))
 
-struct acpi_cstate
-{
+struct acpi_cstate {
 	SLIST_ENTRY(acpi_cstate) link;
 
 	u_short		state;
diff --git a/sys/dev/acpi/acpidmar.h b/sys/dev/acpi/acpidmar.h
index 0c8b128b3ab..775fb689b10 100644
--- a/sys/dev/acpi/acpidmar.h
+++ b/sys/dev/acpi/acpidmar.h
@@ -408,8 +408,7 @@ context_set_user(struct context_entry *ce, int v)
  *   126      = Type (0 = Read, 1 = Write)
  *   127      = Fault bit
  */
-struct fault_entry
-{
+struct fault_entry {
 	uint64_t	lo;
 	uint64_t	hi;
 };
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index f06eead7760..59d88964a66 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audio.c,v 1.208 2024/08/20 07:44:36 mvs Exp $	*/
+/*	$OpenBSD: audio.c,v 1.209 2024/10/22 21:50:02 jsg Exp $	*/
 /*
  * Copyright (c) 2015 Alexandre Ratchov <alex@caoua.org>
  *
@@ -88,8 +88,7 @@ struct audio_buf {
 };
 
 #if NWSKBD > 0
-struct wskbd_vol
-{
+struct wskbd_vol {
 	int val;			/* index of the value control */
 	int mute;			/* index of the mute control */
 	int step;			/* increment/decrement step */
diff --git a/sys/dev/efi/efiio.h b/sys/dev/efi/efiio.h
index 7929b2e82bd..2965134d93e 100644
--- a/sys/dev/efi/efiio.h
+++ b/sys/dev/efi/efiio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efiio.h,v 1.1 2023/01/14 12:11:11 kettenis Exp $	*/
+/*	$OpenBSD: efiio.h,v 1.2 2024/10/22 21:50:02 jsg Exp $	*/
 /*-
  * Copyright (c) 2016 Netflix, Inc.
  * Copyright (c) 2022 3mdeb <contact@3mdeb.com>
@@ -55,16 +55,14 @@ struct efi_esrt_entry_v1 {
 	uint32_t	last_attempt_status;
 };
 
-struct efi_get_table_ioc
-{
+struct efi_get_table_ioc {
 	void *buf;		/* Pointer to userspace buffer */
 	struct uuid uuid;	/* UUID to look up */
 	size_t table_len;	/* Table size */
 	size_t buf_len;		/* Size of the buffer */
 };
 
-struct efi_var_ioc
-{
+struct efi_var_ioc {
 	uint16_t *name;		/* User pointer to name, in UCS2 chars */
 	size_t namesize;	/* Number of *bytes* in the name including
 				   terminator */
diff --git a/sys/dev/ic/aacvar.h b/sys/dev/ic/aacvar.h
index 2044e450b9a..a8003682737 100644
--- a/sys/dev/ic/aacvar.h
+++ b/sys/dev/ic/aacvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aacvar.h,v 1.18 2023/09/11 08:40:25 mvs Exp $	*/
+/*	$OpenBSD: aacvar.h,v 1.19 2024/10/22 21:50:02 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -235,8 +235,7 @@ typedef struct rwlock aac_lock_t;
 /*
  * Per-container data structure
  */
-struct aac_container
-{
+struct aac_container {
 	struct aac_mntobj co_mntobj;
 	int				co_found;
 	TAILQ_ENTRY(aac_container)	co_link;
@@ -246,8 +245,7 @@ struct aac_container
  * A command control block, one for each corresponding command index of the
  * controller.
  */
-struct aac_command
-{
+struct aac_command {
 	TAILQ_ENTRY(aac_command) cm_link;	/* list linkage */
 
 	struct aac_softc	*cm_sc;		/* controller that owns us */
@@ -311,8 +309,7 @@ struct aac_qstat {
 /*
  * Per-controller structure.
  */
-struct aac_softc
-{
+struct aac_softc {
 	struct device aac_dev;
 	void   *aac_ih;
 
diff --git a/sys/dev/ic/adv.h b/sys/dev/ic/adv.h
index d505e5e1221..360f86be081 100644
--- a/sys/dev/ic/adv.h
+++ b/sys/dev/ic/adv.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adv.h,v 1.7 2020/02/18 20:24:52 krw Exp $	*/
+/*	$OpenBSD: adv.h,v 1.8 2024/10/22 21:50:02 jsg Exp $	*/
 /*      $NetBSD: adv.h,v 1.3 1998/09/26 16:02:56 dante Exp $        */
 
 /*
@@ -39,8 +39,7 @@
 
 /******************************************************************************/
 
-struct adv_ccb
-{
+struct adv_ccb {
 	ASC_SG_HEAD	sghead;
 	ASC_SCSI_Q	scsiq;
 
@@ -67,8 +66,7 @@ typedef struct adv_ccb ADV_CCB;
 
 #define ADV_MAX_CCB	32
 
-struct adv_control
-{
+struct adv_control {
 	ADV_CCB	ccbs[ADV_MAX_CCB];	/* all our control blocks */
 };
 
diff --git a/sys/dev/ic/aic79xx.h b/sys/dev/ic/aic79xx.h
index 03d6af31d34..f1e223dd41c 100644
--- a/sys/dev/ic/aic79xx.h
+++ b/sys/dev/ic/aic79xx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx.h,v 1.33 2024/09/04 07:54:52 mglocker Exp $	*/
+/*	$OpenBSD: aic79xx.h,v 1.34 2024/10/22 21:50:02 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -1034,8 +1034,7 @@ typedef uint8_t ahd_mode_state;
 
 typedef void ahd_callback_t (void *);
 
-struct ahd_completion
-{
+struct ahd_completion {
 	uint16_t	tag;
 	uint8_t		sg_status;
 	uint8_t		valid_tag;
diff --git a/sys/dev/ic/trm.h b/sys/dev/ic/trm.h
index 3f0bf34d651..48a0cd16179 100644
--- a/sys/dev/ic/trm.h
+++ b/sys/dev/ic/trm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trm.h,v 1.8 2024/09/04 07:54:52 mglocker Exp $
+/*	$OpenBSD: trm.h,v 1.9 2024/10/22 21:50:02 jsg Exp $
  * ------------------------------------------------------------
  *   O.S       : OpenBSD
  *   File Name : trm.h
@@ -41,8 +41,7 @@
  * Segment Entry
  * ------------------------------------------------------------
  */
-struct SGentry
-{
+struct SGentry {
        u_int32_t        address;
        u_int32_t        length;
 };
@@ -68,8 +67,7 @@ struct SGentry
  *               SCSI Request Block
  *-----------------------------------------------------------------------
  */
-struct trm_scsi_req_q
-{
+struct trm_scsi_req_q {
 	TAILQ_ENTRY(trm_scsi_req_q)      link;
 	bus_dmamap_t	dmamapxfer;
 	u_int32_t	PhysSRB;
@@ -144,8 +142,7 @@ TAILQ_HEAD(SRB_HEAD, trm_scsi_req_q);
  *                   Device Control Block
  *-----------------------------------------------------------------------
  */
-struct trm_dcb
-{
+struct trm_dcb {
 	u_int32_t	TagMask;
 
 	u_int16_t	DCBFlag;
@@ -180,8 +177,7 @@ struct trm_dcb
  *                  Adapter Control Block
  *-----------------------------------------------------------------------
  */
-struct trm_softc
-{
+struct trm_softc {
 	struct	device	sc_device;
 
 	bus_space_handle_t	sc_iohandle;
@@ -226,8 +222,7 @@ struct trm_softc
 /*
  * The SEEPROM structure for TRM_S1040
  */
-struct trm_target_nvram
-{
+struct trm_target_nvram {
     u_int8_t    NvmTarCfg0;        	/* Target configuration byte 0    */
 #define TRM_WIDE                0x20    /* Wide negotiate                 */
 #define TRM_TAG_QUEUING         0x10    /* Enable SCSI tag queuing        */
@@ -241,8 +236,7 @@ struct trm_target_nvram
     u_int8_t    NvmTarCfg3;        	/* Target configuration byte 3    */
 };
 
-struct trm_adapter_nvram
-{
+struct trm_adapter_nvram {
     u_int8_t         NvramSubVendorID[2];     /*0,1  Sub Vendor ID            */
     u_int8_t         NvramSubSysID[2];        /*2,3  Sub System ID            */
     u_int8_t         NvramSubClass;           /*4    Sub Class                */
diff --git a/sys/dev/isa/essvar.h b/sys/dev/isa/essvar.h
index f20fe6cfe29..fcdbb3bf940 100644
--- a/sys/dev/isa/essvar.h
+++ b/sys/dev/isa/essvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: essvar.h,v 1.5 2002/03/14 03:16:05 millert Exp $	*/
+/*	$OpenBSD: essvar.h,v 1.6 2024/10/22 21:50:02 jsg Exp $	*/
 /*	$NetBSD: essvar.h,v 1.14 1999/03/18 06:03:31 mycroft Exp $	*/
 /*
  * Copyright 1997
@@ -34,7 +34,7 @@
  */
 
 /*
-** @(#) $RCSfile: essvar.h,v $ $Revision: 1.5 $ (SHARK) $Date: 2002/03/14 03:16:05 $
+** @(#) $RCSfile: essvar.h,v $ $Revision: 1.6 $ (SHARK) $Date: 2024/10/22 21:50:02 $
 **
 **++
 **
@@ -95,8 +95,7 @@
 #define ESS_1888_NDEVS		22
 #define ESS_MAX_NDEVS		22
 
-struct ess_audio_channel
-{
+struct ess_audio_channel {
 	int	drq;			/* DMA channel */
 #define IS16BITDRQ(drq) ((drq) >= 4)
 	int	irq;			/* IRQ line for this DMA channel */
@@ -118,8 +117,7 @@ struct ess_audio_channel
 	int	blksize;		/* current block size */
 };
 
-struct ess_softc
-{
+struct ess_softc {
 	struct	device sc_dev;		/* base device */
 	struct	device *sc_isa;
 	isa_chipset_tag_t sc_ic;
diff --git a/sys/dev/pci/esavar.h b/sys/dev/pci/esavar.h
index f7e6299d8c1..d41619d33f8 100644
--- a/sys/dev/pci/esavar.h
+++ b/sys/dev/pci/esavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: esavar.h,v 1.2 2010/09/07 16:21:44 deraadt Exp $ */
+/* $OpenBSD: esavar.h,v 1.3 2024/10/22 21:50:02 jsg Exp $ */
 /* $NetBSD: esavar.h,v 1.4 2002/03/16 14:34:01 jmcneill Exp $ */
 
 /*
@@ -96,8 +96,7 @@ struct esa_voice {
 	int			index;	/* 0: play, 1: record */
 };
 
-struct esa_softc
-{
+struct esa_softc {
 	struct device		sc_dev;
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
diff --git a/sys/dev/pci/if_em_osdep.h b/sys/dev/pci/if_em_osdep.h
index 87bd6fbd8de..a22c046c51b 100644
--- a/sys/dev/pci/if_em_osdep.h
+++ b/sys/dev/pci/if_em_osdep.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_em_osdep.h,v 1.14 2020/02/04 10:59:23 mpi Exp $ */
+/* $OpenBSD: if_em_osdep.h,v 1.15 2024/10/22 21:50:02 jsg Exp $ */
 /* $FreeBSD: if_em_osdep.h,v 1.11 2003/05/02 21:17:08 pdeuskar Exp $ */
 
 #ifndef _EM_OPENBSD_OS_H_
@@ -60,8 +60,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define CMD_MEM_WRT_INVALIDATE		0x0010  /* BIT_4 */
 
-struct em_osdep
-{
+struct em_osdep {
 	bus_space_tag_t		mem_bus_space_tag;
 	bus_space_handle_t	mem_bus_space_handle;
 	bus_space_tag_t		io_bus_space_tag;
diff --git a/sys/dev/pci/if_ixgb_osdep.h b/sys/dev/pci/if_ixgb_osdep.h
index 39e0618b35a..5f20759a9f2 100644
--- a/sys/dev/pci/if_ixgb_osdep.h
+++ b/sys/dev/pci/if_ixgb_osdep.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_ixgb_osdep.h,v 1.4 2011/07/26 14:57:57 deraadt Exp $ */
+/* $OpenBSD: if_ixgb_osdep.h,v 1.5 2024/10/22 21:50:02 jsg Exp $ */
 
 #ifndef _IXGB_OPENBSD_OS_H_
 #define _IXGB_OPENBSD_OS_H_
@@ -62,8 +62,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define le16_to_cpu		letoh16
 
-struct ixgb_osdep
-{
+struct ixgb_osdep {
 	bus_space_tag_t		mem_bus_space_tag;
 	bus_space_handle_t	mem_bus_space_handle;
 	struct device		*dev;
diff --git a/sys/dev/sbus/cgtwelvereg.h b/sys/dev/sbus/cgtwelvereg.h
index d6d95ab8786..1f046c1d9d3 100644
--- a/sys/dev/sbus/cgtwelvereg.h
+++ b/sys/dev/sbus/cgtwelvereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgtwelvereg.h,v 1.2 2006/07/20 11:23:49 martin Exp $	*/
+/*	$OpenBSD: cgtwelvereg.h,v 1.3 2024/10/22 21:50:02 jsg Exp $	*/
 
 /*
  * Copyright (c) 2002 Miodrag Vallat.  All rights reserved.
@@ -200,8 +200,7 @@ struct cgtwelve_apu {
 	u_int32_t	test;
 };
 
-struct cgtwelve_dac
-{
+struct cgtwelve_dac {
 	u_int32_t	addr_lo;
 	u_int8_t	pad1[0x100 - 4];
 	u_int32_t	addr_hi;
diff --git a/sys/dev/usb/uchcom.c b/sys/dev/usb/uchcom.c
index c620ea9f40f..19b50b5ad29 100644
--- a/sys/dev/usb/uchcom.c
+++ b/sys/dev/usb/uchcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uchcom.c,v 1.36 2024/05/23 03:21:09 jsg Exp $	*/
+/*	$OpenBSD: uchcom.c,v 1.37 2024/10/22 21:50:02 jsg Exp $	*/
 /*	$NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $	*/
 
 /*
@@ -127,8 +127,7 @@ int	uchcomdebug = 0;
 
 #define UCHCOM_TYPE_CH343	1
 
-struct uchcom_softc
-{
+struct uchcom_softc {
 	struct device		 sc_dev;
 	struct usbd_device	*sc_udev;
 	struct device		*sc_subdev;
@@ -151,8 +150,7 @@ struct uchcom_softc
 	int			 sc_lcr2;
 };
 
-struct uchcom_endpoints
-{
+struct uchcom_endpoints {
 	int		ep_bulkin;
 	int		ep_bulkin_size;
 	int		ep_bulkout;
@@ -160,15 +158,13 @@ struct uchcom_endpoints
 	int		ep_intr_size;
 };
 
-struct uchcom_divider
-{
+struct uchcom_divider {
 	uint8_t		dv_prescaler;
 	uint8_t		dv_div;
 	uint8_t		dv_mod;
 };
 
-struct uchcom_divider_record
-{
+struct uchcom_divider_record {
 	uint32_t		dvr_high;
 	uint32_t		dvr_low;
 	uint32_t		dvr_base_clock;