From da5607f65bdedd8aa46e3abfd846bd3bccd1e805 Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 26 Jun 2024 01:40:49 +0000 Subject: [PATCH] return type on a dedicated line when declaring functions ok mglocker@ --- sys/arch/amd64/amd64/machdep.c | 5 ++- sys/arch/amd64/amd64/vmm_machdep.c | 5 ++- sys/arch/armv7/armv7/intr.c | 22 +++++++---- sys/arch/armv7/omap/intc.c | 5 ++- sys/arch/armv7/omap/omusbtll.c | 6 +-- sys/arch/i386/stand/libsa/machdep.c | 5 ++- sys/arch/luna88k/dev/xp.c | 5 ++- sys/arch/m88k/include/asm_macro.h | 14 ++++--- sys/arch/m88k/m88k/db_trace.c | 6 +-- sys/arch/octeon/include/octeon_model.h | 5 ++- sys/arch/riscv64/riscv64/intr.c | 10 +++-- sys/arch/sh/sh/interrupt.c | 5 ++- sys/arch/sparc64/include/ctlreg.h | 14 +++---- sys/arch/sparc64/include/psl.h | 17 ++++---- sys/arch/sparc64/sparc64/db_interface.c | 23 +++++++---- sys/arch/sparc64/sparc64/pmap.c | 5 ++- sys/arch/sparc64/stand/ofwboot/diskprobe.c | 5 ++- sys/dev/acpi/acpidebug.c | 5 ++- sys/dev/acpi/acpidmar.c | 6 ++- sys/dev/acpi/acpidmar.h | 7 +++- sys/dev/acpi/dsdt.c | 8 ++-- sys/dev/ic/aic7xxx_openbsd.h | 46 +++++++++++----------- sys/dev/ic/ami.c | 5 ++- sys/dev/ic/bt463.c | 23 +++++++---- sys/dev/ic/iosf.c | 5 ++- sys/dev/ic/rtwn.c | 5 ++- sys/dev/isa/ess_isapnp.c | 5 ++- sys/dev/mii/eephy.c | 5 ++- sys/dev/mii/xmphy.c | 5 ++- sys/dev/pci/bktr/bktr_core.c | 8 ++-- sys/dev/pci/if_bnxt.c | 5 ++- sys/dev/pci/if_em_hw.c | 14 ++++--- sys/dev/pci/if_iwx.c | 5 ++- sys/dev/pci/if_sk.c | 5 ++- sys/dev/pci/virtio_pci.c | 6 +-- sys/dev/pci/yds.c | 21 +++++++--- sys/dev/pv/if_vio.c | 5 ++- sys/dev/pv/vioblk.c | 5 ++- sys/dev/pv/viocon.c | 5 ++- sys/dev/pv/viornd.c | 6 +-- sys/dev/wscons/wsmouse.c | 5 ++- sys/kern/kern_malloc.c | 5 ++- sys/net/if_pppoe.c | 5 ++- sys/nfs/nfs_syscalls.c | 5 ++- 44 files changed, 233 insertions(+), 154 deletions(-) diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index 35cea0b5810..66cdafb5e54 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.294 2024/06/07 16:53:35 kettenis Exp $ */ +/* $OpenBSD: machdep.c,v 1.295 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -1294,7 +1294,8 @@ set_sys_segment(struct sys_segment_descriptor *sd, void *base, size_t limit, sd->sd_hibase = (u_int64_t)base >> 24; } -void cpu_init_idt(void) +void +cpu_init_idt(void) { struct region_descriptor region; diff --git a/sys/arch/amd64/amd64/vmm_machdep.c b/sys/arch/amd64/amd64/vmm_machdep.c index 9487ed98f77..f150569d9ea 100644 --- a/sys/arch/amd64/amd64/vmm_machdep.c +++ b/sys/arch/amd64/amd64/vmm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm_machdep.c,v 1.27 2024/05/13 01:15:50 jsg Exp $ */ +/* $OpenBSD: vmm_machdep.c,v 1.28 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2014 Mike Larkin * @@ -8370,7 +8370,8 @@ vmm_decode_perf_status_value(uint64_t val) DPRINTF("(pstate ratio = 0x%llx)\n", (val & 0xffff)); } -void vmm_decode_perf_ctl_value(uint64_t val) +void +vmm_decode_perf_ctl_value(uint64_t val) { DPRINTF("(%s ", (val & PERF_CTL_TURBO) ? "TURBO" : "turbo"); DPRINTF("pstate req = 0x%llx)\n", (val & 0xfffF)); diff --git a/sys/arch/armv7/armv7/intr.c b/sys/arch/armv7/armv7/intr.c index 96bf04bbf4b..225178317e3 100644 --- a/sys/arch/armv7/armv7/intr.c +++ b/sys/arch/armv7/armv7/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.21 2022/07/27 20:26:17 kettenis Exp $ */ +/* $OpenBSD: intr.c,v 1.22 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2011 Dale Rahn * @@ -72,16 +72,21 @@ arm_dflt_intr(void *frame) } -void *arm_intr_establish(int irqno, int level, int (*func)(void *), +void * +arm_intr_establish(int irqno, int level, int (*func)(void *), void *cookie, char *name) { return arm_intr_func.intr_establish(irqno, level, NULL, func, cookie, name); } -void arm_intr_disestablish(void *cookie) + +void +arm_intr_disestablish(void *cookie) { arm_intr_func.intr_disestablish(cookie); } -const char *arm_intr_string(void *cookie) + +const char * +arm_intr_string(void *cookie) { return arm_intr_func.intr_string(cookie); } @@ -657,13 +662,15 @@ arm_dflt_setipl(int newcpl) ci->ci_cpl = newcpl; } -void *arm_dflt_intr_establish(int irqno, int level, struct cpu_info *ci, +void * +arm_dflt_intr_establish(int irqno, int level, struct cpu_info *ci, int (*func)(void *), void *cookie, char *name) { panic("arm_dflt_intr_establish called"); } -void arm_dflt_intr_disestablish(void *cookie) +void +arm_dflt_intr_disestablish(void *cookie) { panic("arm_dflt_intr_disestablish called"); } @@ -721,7 +728,8 @@ arm_do_pending_intr(int pcpl) restore_interrupts(oldirqstate); } -void arm_set_intr_handler(int (*raise)(int), int (*lower)(int), +void +arm_set_intr_handler(int (*raise)(int), int (*lower)(int), void (*x)(int), void (*setipl)(int), void *(*intr_establish)(int irqno, int level, struct cpu_info *ci, int (*func)(void *), void *cookie, char *name), diff --git a/sys/arch/armv7/omap/intc.c b/sys/arch/armv7/omap/intc.c index 507a4a85f96..382dd632df0 100644 --- a/sys/arch/armv7/omap/intc.c +++ b/sys/arch/armv7/omap/intc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intc.c,v 1.14 2024/04/29 12:42:06 jsg Exp $ */ +/* $OpenBSD: intc.c,v 1.15 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn * @@ -418,7 +418,8 @@ intc_tst(void *a) } void intc_test(void); -void intc_test(void) +void +intc_test(void) { void * ih; printf("about to register handler\n"); diff --git a/sys/arch/armv7/omap/omusbtll.c b/sys/arch/armv7/omap/omusbtll.c index ada7b36c3af..937dec4f8b4 100644 --- a/sys/arch/armv7/omap/omusbtll.c +++ b/sys/arch/armv7/omap/omusbtll.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omusbtll.c,v 1.5 2021/10/24 17:52:28 mpi Exp $ */ +/* $OpenBSD: omusbtll.c,v 1.6 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2010 Dale Rahn * @@ -132,8 +132,8 @@ omusbtll_attach(struct device *parent, struct device *self, void *args) omusbtll_init(0x3); } - -void omusbtll_init(uint32_t channel_mask) +void +omusbtll_init(uint32_t channel_mask) { int i; uint32_t val; diff --git a/sys/arch/i386/stand/libsa/machdep.c b/sys/arch/i386/stand/libsa/machdep.c index e65d85e5e3c..12fdf73668d 100644 --- a/sys/arch/i386/stand/libsa/machdep.c +++ b/sys/arch/i386/stand/libsa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.40 2022/07/07 00:56:47 daniel Exp $ */ +/* $OpenBSD: machdep.c,v 1.41 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -112,7 +112,8 @@ machdep(void) } } -int check_skip_conf(void) +int +check_skip_conf(void) { /* Return non-zero (skip boot.conf) if Control "shift" key down */ #ifndef EFIBOOT diff --git a/sys/arch/luna88k/dev/xp.c b/sys/arch/luna88k/dev/xp.c index 01b480c0515..c71c43abad4 100644 --- a/sys/arch/luna88k/dev/xp.c +++ b/sys/arch/luna88k/dev/xp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xp.c,v 1.3 2017/09/08 05:36:52 deraadt Exp $ */ +/* $OpenBSD: xp.c,v 1.4 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: xp.c,v 1.1 2016/12/03 17:38:02 tsutsui Exp $ */ /*- @@ -105,7 +105,8 @@ static bool xp_matched; #define ON 1 #define OFF 0 -static uint8_t put_pio0c(uint8_t bit, uint8_t set) +static uint8_t +put_pio0c(uint8_t bit, uint8_t set) { volatile uint8_t * const pio0 = (uint8_t *)PIO_ADDR; diff --git a/sys/arch/m88k/include/asm_macro.h b/sys/arch/m88k/include/asm_macro.h index 8875521b8ca..3bd499ab756 100644 --- a/sys/arch/m88k/include/asm_macro.h +++ b/sys/arch/m88k/include/asm_macro.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm_macro.h,v 1.10 2014/03/29 18:09:29 guenther Exp $ */ +/* $OpenBSD: asm_macro.h,v 1.11 2024/06/26 01:40:49 jsg Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -43,7 +43,8 @@ /* * Set the PSR. */ -static __inline__ void set_psr(u_int psr) +static __inline__ void +set_psr(u_int psr) { __asm__ volatile ("stcr %0, %%cr1" :: "r" (psr)); flush_pipeline(); @@ -52,7 +53,8 @@ static __inline__ void set_psr(u_int psr) /* * Get the PSR. */ -static __inline__ u_int get_psr(void) +static __inline__ u_int +get_psr(void) { u_int psr; __asm__ volatile ("ldcr %0, %%cr1" : "=r" (psr)); @@ -62,13 +64,15 @@ static __inline__ u_int get_psr(void) /* * Provide access from C code to the assembly instruction ff1 */ -static __inline__ u_int ff1(u_int val) +static __inline__ u_int +ff1(u_int val) { __asm__ volatile ("ff1 %0, %0" : "=r" (val) : "0" (val)); return (val); } -static __inline__ u_int get_cpu_pid(void) +static __inline__ u_int +get_cpu_pid(void) { u_int pid; __asm__ volatile ("ldcr %0, %%cr0" : "=r" (pid)); diff --git a/sys/arch/m88k/m88k/db_trace.c b/sys/arch/m88k/m88k/db_trace.c index f6482c2c975..47d0b4755ce 100644 --- a/sys/arch/m88k/m88k/db_trace.c +++ b/sys/arch/m88k/m88k/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.19 2023/04/11 00:45:07 jsg Exp $ */ +/* $OpenBSD: db_trace.c,v 1.20 2024/06/26 01:40:49 jsg Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -45,8 +45,8 @@ #define DPRINTF(stmt) do { } while (0) #endif -static inline -u_int br_dest(vaddr_t addr, u_int inst) +static inline u_int +br_dest(vaddr_t addr, u_int inst) { inst = (inst & 0x03ffffff) << 2; /* check if sign extension is needed */ diff --git a/sys/arch/octeon/include/octeon_model.h b/sys/arch/octeon/include/octeon_model.h index 9dd2d084bbd..4458219be0d 100644 --- a/sys/arch/octeon/include/octeon_model.h +++ b/sys/arch/octeon/include/octeon_model.h @@ -1,4 +1,4 @@ -/* $OpenBSD: octeon_model.h,v 1.8 2022/12/28 01:39:21 yasuoka Exp $ */ +/* $OpenBSD: octeon_model.h,v 1.9 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2007 @@ -63,7 +63,8 @@ /* * get chip id */ -static inline uint32_t octeon_get_chipid(void) +static inline uint32_t +octeon_get_chipid(void) { uint32_t tmp; diff --git a/sys/arch/riscv64/riscv64/intr.c b/sys/arch/riscv64/riscv64/intr.c index a5263e70099..b7cb8c5eb2f 100644 --- a/sys/arch/riscv64/riscv64/intr.c +++ b/sys/arch/riscv64/riscv64/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.10 2022/07/27 20:26:17 kettenis Exp $ */ +/* $OpenBSD: intr.c,v 1.11 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2011 Dale Rahn @@ -621,8 +621,9 @@ riscv_do_pending_intr(int pcpl) intr_restore(sie); } -void riscv_set_intr_func(int (*raise)(int), int (*lower)(int), - void (*x)(int), void (*setipl)(int)) +void +riscv_set_intr_func(int (*raise)(int), int (*lower)(int), void (*x)(int), + void (*setipl)(int)) { riscv_intr_func.raise = raise; riscv_intr_func.lower = lower; @@ -630,7 +631,8 @@ void riscv_set_intr_func(int (*raise)(int), int (*lower)(int), riscv_intr_func.setipl = setipl; } -void riscv_set_intr_handler(void (*intr_handle)(void *)) +void +riscv_set_intr_handler(void (*intr_handle)(void *)) { riscv_intr_dispatch = intr_handle; } diff --git a/sys/arch/sh/sh/interrupt.c b/sys/arch/sh/sh/interrupt.c index a2caa6ba666..20c5bf4fabb 100644 --- a/sys/arch/sh/sh/interrupt.c +++ b/sys/arch/sh/sh/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.18 2024/05/22 14:25:47 jsg Exp $ */ +/* $OpenBSD: interrupt.c,v 1.19 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: interrupt.c,v 1.18 2006/01/25 00:02:57 uwe Exp $ */ /*- @@ -663,7 +663,8 @@ softintr_disestablish(void *arg) } /* Schedule a software interrupt. */ -void softintr_schedule(void *arg) +void +softintr_schedule(void *arg) { struct sh_soft_intrhand *sih = arg; struct sh_soft_intr *si = sih->sih_intrhead; diff --git a/sys/arch/sparc64/include/ctlreg.h b/sys/arch/sparc64/include/ctlreg.h index 0872b12b423..72c27c06a55 100644 --- a/sys/arch/sparc64/include/ctlreg.h +++ b/sys/arch/sparc64/include/ctlreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ctlreg.h,v 1.31 2024/03/30 01:13:56 jsg Exp $ */ +/* $OpenBSD: ctlreg.h,v 1.32 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: ctlreg.h,v 1.28 2001/08/06 23:55:34 eeh Exp $ */ /* @@ -676,23 +676,23 @@ STNC_GEN(u_int, sta); static inline void asi_set(int); -static inline -void asi_set(int asi) +static inline void +asi_set(int asi) { sparc_wr(asi, asi, 0); } static inline u_int8_t asi_get(void); -static inline -u_int8_t asi_get(void) +static inline u_int8_t +asi_get(void) { return sparc_rd(asi); } /* flush address from instruction cache */ static inline void flush(void *); -static inline -void flush(void *p) +static inline void +flush(void *p) { __asm volatile("flush %0" : : "r" (p) diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h index 1ef57d86a07..e531724df5b 100644 --- a/sys/arch/sparc64/include/psl.h +++ b/sys/arch/sparc64/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.35 2019/06/29 15:41:21 deraadt Exp $ */ +/* $OpenBSD: psl.h,v 1.36 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */ /* @@ -250,21 +250,22 @@ void splassert_check(int, const char *); * GCC pseudo-functions for manipulating privileged registers */ static inline u_int64_t getpstate(void); -static inline -u_int64_t getpstate(void) +static inline u_int64_t +getpstate(void) { return (sparc_rdpr(pstate)); } static inline void setpstate(u_int64_t); -static inline void setpstate(u_int64_t newpstate) +static inline void +setpstate(u_int64_t newpstate) { sparc_wrpr(pstate, newpstate, 0); } static inline int getcwp(void); -static inline -int getcwp(void) +static inline int +getcwp(void) { return (sparc_rdpr(cwp)); } @@ -277,8 +278,8 @@ setcwp(u_int64_t newcwp) } static inline u_int64_t getver(void); -static inline -u_int64_t getver(void) +static inline u_int64_t +getver(void) { return (sparc_rdpr(ver)); } diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c index 9856df29d29..ae1aeac4553 100644 --- a/sys/arch/sparc64/sparc64/db_interface.c +++ b/sys/arch/sparc64/sparc64/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.65 2024/05/13 01:15:50 jsg Exp $ */ +/* $OpenBSD: db_interface.c,v 1.66 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */ /* @@ -581,7 +581,8 @@ db_get_itlb_data(int entry), db_get_itlb_tag(int entry); void db_print_itlb_entry(int entry, int i, int endc); void db_print_dtlb_entry(int entry, int i, int endc); -extern __inline__ unsigned long db_get_dtlb_data(int entry) +extern __inline__ unsigned long +db_get_dtlb_data(int entry) { unsigned long r; __asm__ volatile("ldxa [%1] %2,%0" @@ -589,7 +590,9 @@ extern __inline__ unsigned long db_get_dtlb_data(int entry) : "r" (entry <<3), "i" (ASI_DMMU_TLB_DATA)); return r; } -extern __inline__ unsigned long db_get_dtlb_tag(int entry) + +extern __inline__ unsigned long +db_get_dtlb_tag(int entry) { unsigned long r; __asm__ volatile("ldxa [%1] %2,%0" @@ -597,7 +600,9 @@ extern __inline__ unsigned long db_get_dtlb_tag(int entry) : "r" (entry <<3), "i" (ASI_DMMU_TLB_TAG)); return r; } -extern __inline__ unsigned long db_get_itlb_data(int entry) + +extern __inline__ unsigned long +db_get_itlb_data(int entry) { unsigned long r; __asm__ volatile("ldxa [%1] %2,%0" @@ -605,7 +610,9 @@ extern __inline__ unsigned long db_get_itlb_data(int entry) : "r" (entry <<3), "i" (ASI_IMMU_TLB_DATA)); return r; } -extern __inline__ unsigned long db_get_itlb_tag(int entry) + +extern __inline__ unsigned long +db_get_itlb_tag(int entry) { unsigned long r; __asm__ volatile("ldxa [%1] %2,%0" @@ -614,7 +621,8 @@ extern __inline__ unsigned long db_get_itlb_tag(int entry) return r; } -void db_print_dtlb_entry(int entry, int i, int endc) +void +db_print_dtlb_entry(int entry, int i, int endc) { unsigned long tag, data; tag = db_get_dtlb_tag(entry); @@ -622,7 +630,8 @@ void db_print_dtlb_entry(int entry, int i, int endc) db_printf("%2d:%16.16lx %16.16lx%c", i, tag, data, endc); } -void db_print_itlb_entry(int entry, int i, int endc) +void +db_print_itlb_entry(int entry, int i, int endc) { unsigned long tag, data; tag = db_get_itlb_tag(entry); diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c index 7a319ef163d..1be038f3ffc 100644 --- a/sys/arch/sparc64/sparc64/pmap.c +++ b/sys/arch/sparc64/sparc64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.120 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: pmap.c,v 1.121 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: pmap.c,v 1.107 2001/08/31 16:47:41 eeh Exp $ */ /* * @@ -2134,7 +2134,8 @@ pmap_dumpmmu(int (*dump)(dev_t, daddr_t, caddr_t, size_t), daddr_t blkno) /* * Determine (non)existence of physical page */ -int pmap_pa_exists(paddr_t pa) +int +pmap_pa_exists(paddr_t pa) { struct mem_region *mp; diff --git a/sys/arch/sparc64/stand/ofwboot/diskprobe.c b/sys/arch/sparc64/stand/ofwboot/diskprobe.c index 9fa8d3ea895..682011dad3a 100644 --- a/sys/arch/sparc64/stand/ofwboot/diskprobe.c +++ b/sys/arch/sparc64/stand/ofwboot/diskprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskprobe.c,v 1.7 2023/06/01 17:24:56 krw Exp $ */ +/* $OpenBSD: diskprobe.c,v 1.8 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2008 Mark Kettenis @@ -103,7 +103,8 @@ bad: } #ifdef BOOT_DEBUG -void dump_node(int node) +void +dump_node(int node) { char buf[32]; diff --git a/sys/dev/acpi/acpidebug.c b/sys/dev/acpi/acpidebug.c index 673371d6acf..49ca72e4137 100644 --- a/sys/dev/acpi/acpidebug.c +++ b/sys/dev/acpi/acpidebug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpidebug.c,v 1.34 2024/05/13 01:15:50 jsg Exp $ */ +/* $OpenBSD: acpidebug.c,v 1.35 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom * @@ -289,7 +289,8 @@ db_acpi_showval(db_expr_t addr, int haddr, db_expr_t count, char *modif) db_printf("Not a valid value\n"); } -void db_disprint(void *arg, const char *fmt, ...) +void +db_disprint(void *arg, const char *fmt, ...) { va_list ap; diff --git a/sys/dev/acpi/acpidmar.c b/sys/dev/acpi/acpidmar.c index 1a789278348..6ca88352813 100644 --- a/sys/dev/acpi/acpidmar.c +++ b/sys/dev/acpi/acpidmar.c @@ -223,12 +223,14 @@ struct iommu_softc { paddr_t evt_tblp; }; -static inline int iommu_bad(struct iommu_softc *sc) +static inline int +iommu_bad(struct iommu_softc *sc) { return (sc->flags & IOMMU_FLAGS_BAD); } -static inline int iommu_enabled(struct iommu_softc *sc) +static inline int +iommu_enabled(struct iommu_softc *sc) { if (sc->dte) { return 1; diff --git a/sys/dev/acpi/acpidmar.h b/sys/dev/acpi/acpidmar.h index 61d02248a55..0c8b128b3ab 100644 --- a/sys/dev/acpi/acpidmar.h +++ b/sys/dev/acpi/acpidmar.h @@ -230,12 +230,15 @@ #define IQA_QS_32K 7 /* 32768 */ /* Read-Modify-Write helpers */ -static inline void iommu_rmw32(void *ov, uint32_t mask, uint32_t shift, uint32_t nv) +static inline void +iommu_rmw32(void *ov, uint32_t mask, uint32_t shift, uint32_t nv) { *(uint32_t *)ov &= ~(mask << shift); *(uint32_t *)ov |= (nv & mask) << shift; } -static inline void iommu_rmw64(void *ov, uint32_t mask, uint32_t shift, uint64_t nv) + +static inline void +iommu_rmw64(void *ov, uint32_t mask, uint32_t shift, uint64_t nv) { *(uint64_t *)ov &= ~(mask << shift); *(uint64_t *)ov |= (nv & mask) << shift; diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c index 3f75b2de8ce..aeb114da395 100644 --- a/sys/dev/acpi/dsdt.c +++ b/sys/dev/acpi/dsdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsdt.c,v 1.268 2024/05/14 08:26:13 jsg Exp $ */ +/* $OpenBSD: dsdt.c,v 1.269 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2005 Jordan Hargrave * @@ -251,7 +251,8 @@ struct aml_opcode aml_table[] = { { AMLOP_COPYOBJECT, "CopyObject", "tS", }, }; -int aml_pc(uint8_t *src) +int +aml_pc(uint8_t *src) { return src - aml_root.start; } @@ -1668,7 +1669,8 @@ aml_foreachpkg(struct aml_value *pkg, int start, */ int aml_fixup_node(struct aml_node *, void *); -int aml_fixup_node(struct aml_node *node, void *arg) +int +aml_fixup_node(struct aml_node *node, void *arg) { struct aml_value *val = arg; int i; diff --git a/sys/dev/ic/aic7xxx_openbsd.h b/sys/dev/ic/aic7xxx_openbsd.h index 061a1b54cbc..54a7b03b6f0 100644 --- a/sys/dev/ic/aic7xxx_openbsd.h +++ b/sys/dev/ic/aic7xxx_openbsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_openbsd.h,v 1.32 2024/05/29 00:48:15 jsg Exp $ */ +/* $OpenBSD: aic7xxx_openbsd.h,v 1.33 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: aic7xxx_osm.h,v 1.7 2003/11/02 11:07:44 wiz Exp $ */ /* @@ -209,20 +209,20 @@ static __inline uint32_t ahc_get_sense_bufsize(struct ahc_softc *, struct scb *); static __inline void ahc_freeze_scb(struct scb *); -static __inline -void ahc_set_transaction_status(struct scb *scb, uint32_t status) +static __inline void +ahc_set_transaction_status(struct scb *scb, uint32_t status) { scb->xs->error = status; } -static __inline -void ahc_set_scsi_status(struct scb *scb, uint32_t status) +static __inline void +ahc_set_scsi_status(struct scb *scb, uint32_t status) { scb->xs->status = status; } -static __inline -uint32_t ahc_get_transaction_status(struct scb *scb) +static __inline uint32_t +ahc_get_transaction_status(struct scb *scb) { if (scb->xs->flags & ITSDONE) return CAM_REQ_CMP; @@ -230,49 +230,49 @@ uint32_t ahc_get_transaction_status(struct scb *scb) return scb->xs->error; } -static __inline -uint32_t ahc_get_scsi_status(struct scb *scb) +static __inline uint32_t +ahc_get_scsi_status(struct scb *scb) { return (scb->xs->status); } -static __inline -void ahc_set_transaction_tag(struct scb *scb, int enabled, u_int type) +static __inline void +ahc_set_transaction_tag(struct scb *scb, int enabled, u_int type) { } -static __inline -u_long ahc_get_transfer_length(struct scb *scb) +static __inline u_long +ahc_get_transfer_length(struct scb *scb) { return (scb->xs->datalen); } -static __inline -int ahc_get_transfer_dir(struct scb *scb) +static __inline int +ahc_get_transfer_dir(struct scb *scb) { return (scb->xs->flags & (SCSI_DATA_IN | SCSI_DATA_OUT)); } -static __inline -void ahc_set_residual(struct scb *scb, u_long resid) +static __inline void +ahc_set_residual(struct scb *scb, u_long resid) { scb->xs->resid = resid; } -static __inline -void ahc_set_sense_residual(struct scb *scb, u_long resid) +static __inline void +ahc_set_sense_residual(struct scb *scb, u_long resid) { scb->xs->resid = resid; } -static __inline -u_long ahc_get_residual(struct scb *scb) +static __inline u_long +ahc_get_residual(struct scb *scb) { return (scb->xs->resid); } -static __inline -int ahc_perform_autosense(struct scb *scb) +static __inline int +ahc_perform_autosense(struct scb *scb) { /* Return true for OpenBSD */ return (1); diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index 7b8ed4c48e3..98195eccd6c 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.262 2022/04/16 19:19:58 naddy Exp $ */ +/* $OpenBSD: ami.c,v 1.263 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -2277,7 +2277,8 @@ bail: return (error); } -int ami_ioctl_alarm(struct ami_softc *sc, struct bioc_alarm *ba) +int +ami_ioctl_alarm(struct ami_softc *sc, struct bioc_alarm *ba) { int error = 0; u_int8_t func, ret; diff --git a/sys/dev/ic/bt463.c b/sys/dev/ic/bt463.c index 1ee7a8197b7..b27c23155b3 100644 --- a/sys/dev/ic/bt463.c +++ b/sys/dev/ic/bt463.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt463.c,v 1.13 2014/07/08 17:19:25 deraadt Exp $ */ +/* $OpenBSD: bt463.c,v 1.14 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: bt463.c,v 1.2 2000/06/13 17:21:06 nathanw Exp $ */ /*- @@ -492,7 +492,8 @@ bt463_get_curcmap(rc, cursorp) */ #ifdef BT463_DEBUG -int bt463_store(void *v) +int +bt463_store(void *v) { struct bt463data *data = (struct bt463data *)v; @@ -504,7 +505,8 @@ int bt463_store(void *v) } -int bt463_readback(void *v) +int +bt463_readback(void *v) { struct bt463data *data = (struct bt463data *)v; @@ -623,7 +625,8 @@ bt463_update(p) data->changed = 0; } -int bt463_set_cursor (rc, cur) +int +bt463_set_cursor (rc, cur) struct ramdac_cookie *rc; struct wsdisplay_cursor *cur; { @@ -631,7 +634,8 @@ int bt463_set_cursor (rc, cur) return tga_builtin_set_cursor(data->cookie, cur); } -int bt463_get_cursor (rc, cur) +int +bt463_get_cursor (rc, cur) struct ramdac_cookie *rc; struct wsdisplay_cursor *cur; { @@ -639,7 +643,8 @@ int bt463_get_cursor (rc, cur) return tga_builtin_get_cursor(data->cookie, cur); } -int bt463_set_curpos (rc, cur) +int +bt463_set_curpos (rc, cur) struct ramdac_cookie *rc; struct wsdisplay_curpos *cur; { @@ -647,7 +652,8 @@ int bt463_set_curpos (rc, cur) return tga_builtin_set_curpos(data->cookie, cur); } -int bt463_get_curpos (rc, cur) +int +bt463_get_curpos (rc, cur) struct ramdac_cookie *rc; struct wsdisplay_curpos *cur; { @@ -655,7 +661,8 @@ int bt463_get_curpos (rc, cur) return tga_builtin_get_curpos(data->cookie, cur); } -int bt463_get_curmax (rc, cur) +int +bt463_get_curmax (rc, cur) struct ramdac_cookie *rc; struct wsdisplay_curpos *cur; { diff --git a/sys/dev/ic/iosf.c b/sys/dev/ic/iosf.c index 16f4a4018c7..fda04b0e90d 100644 --- a/sys/dev/ic/iosf.c +++ b/sys/dev/ic/iosf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iosf.c,v 1.1 2023/04/23 00:20:26 dlg Exp $ */ +/* $OpenBSD: iosf.c,v 1.2 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2023 David Gwynne @@ -253,7 +253,8 @@ iosf_mbi_punit_release(void) rw_exit_write(&iosf_lock); } -void iosf_mbi_assert_punit_acquired(void) +void +iosf_mbi_assert_punit_acquired(void) { int s; diff --git a/sys/dev/ic/rtwn.c b/sys/dev/ic/rtwn.c index b9b83bbfe11..3df98b19fa7 100644 --- a/sys/dev/ic/rtwn.c +++ b/sys/dev/ic/rtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtwn.c,v 1.57 2023/04/28 01:24:14 kevlo Exp $ */ +/* $OpenBSD: rtwn.c,v 1.58 2024/06/26 01:40:49 jsg Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini @@ -857,7 +857,8 @@ rtwn_ra_init(struct rtwn_softc *sc) /* * Initialize rate adaptation in firmware. */ -int rtwn_r92c_ra_init(struct rtwn_softc *sc, u_int8_t mode, u_int32_t rates, +int +rtwn_r92c_ra_init(struct rtwn_softc *sc, u_int8_t mode, u_int32_t rates, int maxrate, uint32_t basicrates, int maxbasicrate) { struct r92c_fw_cmd_macid_cfg cmd; diff --git a/sys/dev/isa/ess_isapnp.c b/sys/dev/isa/ess_isapnp.c index 22381ecc901..7ec1ffc1fdf 100644 --- a/sys/dev/isa/ess_isapnp.c +++ b/sys/dev/isa/ess_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ess_isapnp.c,v 1.8 2022/04/06 18:59:28 naddy Exp $ */ +/* $OpenBSD: ess_isapnp.c,v 1.9 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: ess_isa.c,v 1.4 1999/03/18 20:57:11 mycroft Exp $ */ /*- @@ -63,7 +63,8 @@ ess_isapnp_probe(struct device *parent, void *match, void *aux) return 1; } -void ess_isapnp_attach(struct device *parent, struct device *self, void *aux) +void +ess_isapnp_attach(struct device *parent, struct device *self, void *aux) { struct ess_softc *sc = (void *)self; struct isa_attach_args *ia = aux; diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c index 2e2ffe8c26b..58a19a4ba99 100644 --- a/sys/dev/mii/eephy.c +++ b/sys/dev/mii/eephy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eephy.c,v 1.65 2024/03/17 00:06:43 patrick Exp $ */ +/* $OpenBSD: eephy.c,v 1.66 2024/06/26 01:40:49 jsg Exp $ */ /* * Principal Author: Parag Patel * Copyright (c) 2001 @@ -443,7 +443,8 @@ eephy_status(struct mii_softc *sc) } #ifdef __HAVE_FDT -void eephy_fdt_reg_init(struct mii_softc *sc) +void +eephy_fdt_reg_init(struct mii_softc *sc) { uint32_t *prop, opage; int i, len; diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c index fdc537ac371..a901002f3cd 100644 --- a/sys/dev/mii/xmphy.c +++ b/sys/dev/mii/xmphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xmphy.c,v 1.25 2024/05/27 04:58:43 jsg Exp $ */ +/* $OpenBSD: xmphy.c,v 1.26 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2000 @@ -85,7 +85,8 @@ static const struct mii_phydesc xmphys[] = { NULL }, }; -int xmphy_probe(struct device *parent, void *match, void *aux) +int +xmphy_probe(struct device *parent, void *match, void *aux) { struct mii_attach_args *ma = aux; diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index a74745adc8f..bb2fda021ec 100644 --- a/sys/dev/pci/bktr/bktr_core.c +++ b/sys/dev/pci/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_core.c,v 1.44 2024/06/22 10:22:29 jsg Exp $ */ +/* $OpenBSD: bktr_core.c,v 1.45 2024/06/26 01:40:49 jsg Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */ /* @@ -3504,7 +3504,8 @@ set_fps( bktr_ptr_t bktr, u_short fps ) * as one would expect. */ -static u_int pixfmt_swap_flags( int pixfmt ) +static u_int +pixfmt_swap_flags( int pixfmt ) { const struct meteor_pixfmt *pf = &pixfmt_table[ pixfmt ].public; u_int swapf = 0; @@ -3541,7 +3542,8 @@ static u_int pixfmt_swap_flags( int pixfmt ) * our pixfmt_table indices. */ -static int oformat_meteor_to_bt( u_int format ) +static int +oformat_meteor_to_bt( u_int format ) { int i; const struct meteor_pixfmt *pf1, *pf2; diff --git a/sys/dev/pci/if_bnxt.c b/sys/dev/pci/if_bnxt.c index f5c757ea2a6..52165d95f2c 100644 --- a/sys/dev/pci/if_bnxt.c +++ b/sys/dev/pci/if_bnxt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnxt.c,v 1.50 2024/05/24 06:02:53 jsg Exp $ */ +/* $OpenBSD: if_bnxt.c,v 1.51 2024/06/26 01:40:49 jsg Exp $ */ /*- * Broadcom NetXtreme-C/E network driver. * @@ -3502,7 +3502,8 @@ _bnxt_hwrm_set_async_event_bit(struct hwrm_func_drv_rgtr_input *req, int bit) req->async_event_fwd[bit/32] |= (1 << (bit % 32)); } -int bnxt_hwrm_func_rgtr_async_events(struct bnxt_softc *softc) +int +bnxt_hwrm_func_rgtr_async_events(struct bnxt_softc *softc) { struct hwrm_func_drv_rgtr_input req = {0}; int events[] = { diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index c87904a1b1a..2ce546e5c4d 100644 --- a/sys/dev/pci/if_em_hw.c +++ b/sys/dev/pci/if_em_hw.c @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.c,v 1.121 2024/05/24 06:02:53 jsg Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.122 2024/06/26 01:40:49 jsg Exp $ */ /* * if_em_hw.c Shared functions for accessing and configuring the MAC */ @@ -5515,7 +5515,8 @@ em_write_kmrn_reg(struct em_hw *hw, uint32_t reg_addr, uint16_t data) * Called to determine if the I2C pins are being used for I2C or as an * external MDIO interface since the two options are mutually exclusive. **/ -int em_sgmii_uses_mdio_82575(struct em_hw *hw) +int +em_sgmii_uses_mdio_82575(struct em_hw *hw) { uint32_t reg = 0; int ext_mdio = 0; @@ -5549,7 +5550,8 @@ int em_sgmii_uses_mdio_82575(struct em_hw *hw) * Reads the PHY register at offset using the i2c interface and stores the * retrieved information in data. **/ -int32_t em_read_phy_reg_i2c(struct em_hw *hw, uint32_t offset, uint16_t *data) +int32_t +em_read_phy_reg_i2c(struct em_hw *hw, uint32_t offset, uint16_t *data) { uint32_t i, i2ccmd = 0; @@ -5595,7 +5597,8 @@ int32_t em_read_phy_reg_i2c(struct em_hw *hw, uint32_t offset, uint16_t *data) * * Writes the data to PHY register at the offset using the i2c interface. **/ -int32_t em_write_phy_reg_i2c(struct em_hw *hw, uint32_t offset, uint16_t data) +int32_t +em_write_phy_reg_i2c(struct em_hw *hw, uint32_t offset, uint16_t data) { uint32_t i, i2ccmd = 0; uint16_t phy_data_swapped; @@ -5655,7 +5658,8 @@ int32_t em_write_phy_reg_i2c(struct em_hw *hw, uint32_t offset, uint16_t data) * E1000_I2CCMD_SFP_DIAG_ADDR() for SFP diagnostics parameters * access **/ -int32_t em_read_sfp_data_byte(struct em_hw *hw, uint16_t offset, uint8_t *data) +int32_t +em_read_sfp_data_byte(struct em_hw *hw, uint16_t offset, uint8_t *data) { uint32_t i = 0; uint32_t i2ccmd = 0; diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c index b692620777e..f3c693a838c 100644 --- a/sys/dev/pci/if_iwx.c +++ b/sys/dev/pci/if_iwx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwx.c,v 1.186 2024/05/24 06:02:53 jsg Exp $ */ +/* $OpenBSD: if_iwx.c,v 1.187 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh @@ -597,7 +597,8 @@ iwx_ctxt_info_alloc_dma(struct iwx_softc *sc, return 0; } -void iwx_ctxt_info_free_paging(struct iwx_softc *sc) +void +iwx_ctxt_info_free_paging(struct iwx_softc *sc) { struct iwx_self_init_dram *dram = &sc->init_dram; int i; diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index e9997ac70a8..7b85f1ce978 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.196 2024/05/24 06:02:57 jsg Exp $ */ +/* $OpenBSD: if_sk.c,v 1.197 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -2083,7 +2083,8 @@ sk_init_xmac(struct sk_if_softc *sc_if) sc_if->sk_link = 1; } -void sk_init_yukon(struct sk_if_softc *sc_if) +void +sk_init_yukon(struct sk_if_softc *sc_if) { u_int32_t phy, v; u_int16_t reg; diff --git a/sys/dev/pci/virtio_pci.c b/sys/dev/pci/virtio_pci.c index a330a49fd8f..f069df6887e 100644 --- a/sys/dev/pci/virtio_pci.c +++ b/sys/dev/pci/virtio_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: virtio_pci.c,v 1.37 2024/05/17 16:37:10 sf Exp $ */ +/* $OpenBSD: virtio_pci.c,v 1.38 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */ /* @@ -162,8 +162,8 @@ struct virtio_ops virtio_pci_ops = { virtio_pci_poll_intr, }; -static inline -uint64_t _cread(struct virtio_pci_softc *sc, unsigned off, unsigned size) +static inline uint64_t +_cread(struct virtio_pci_softc *sc, unsigned off, unsigned size) { uint64_t val; switch (size) { diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c index 888492d2b4e..eae06855f1d 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yds.c,v 1.64 2024/05/24 06:02:58 jsg Exp $ */ +/* $OpenBSD: yds.c,v 1.65 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $ */ /* @@ -107,27 +107,36 @@ void YWRITE1(struct yds_softc *sc,bus_size_t r,u_int8_t x); void YWRITE2(struct yds_softc *sc,bus_size_t r,u_int16_t x); void YWRITE4(struct yds_softc *sc,bus_size_t r,u_int32_t x); -u_int16_t YREAD2(struct yds_softc *sc,bus_size_t r) +u_int16_t +YREAD2(struct yds_softc *sc,bus_size_t r) { DPRINTFN(5, (" YREAD2(0x%lX)\n",(unsigned long)r)); return bus_space_read_2(sc->memt,sc->memh,r); } -u_int32_t YREAD4(struct yds_softc *sc,bus_size_t r) + +u_int32_t +YREAD4(struct yds_softc *sc,bus_size_t r) { DPRINTFN(5, (" YREAD4(0x%lX)\n",(unsigned long)r)); return bus_space_read_4(sc->memt,sc->memh,r); } -void YWRITE1(struct yds_softc *sc,bus_size_t r,u_int8_t x) + +void +YWRITE1(struct yds_softc *sc,bus_size_t r,u_int8_t x) { DPRINTFN(5, (" YWRITE1(0x%lX,0x%lX)\n",(unsigned long)r,(unsigned long)x)); bus_space_write_1(sc->memt,sc->memh,r,x); } -void YWRITE2(struct yds_softc *sc,bus_size_t r,u_int16_t x) + +void +YWRITE2(struct yds_softc *sc,bus_size_t r,u_int16_t x) { DPRINTFN(5, (" YWRITE2(0x%lX,0x%lX)\n",(unsigned long)r,(unsigned long)x)); bus_space_write_2(sc->memt,sc->memh,r,x); } -void YWRITE4(struct yds_softc *sc,bus_size_t r,u_int32_t x) + +void +YWRITE4(struct yds_softc *sc,bus_size_t r,u_int32_t x) { DPRINTFN(5, (" YWRITE4(0x%lX,0x%lX)\n",(unsigned long)r,(unsigned long)x)); bus_space_write_4(sc->memt,sc->memh,r,x); diff --git a/sys/dev/pv/if_vio.c b/sys/dev/pv/if_vio.c index 353e42b09c1..f216b83cdf1 100644 --- a/sys/dev/pv/if_vio.c +++ b/sys/dev/pv/if_vio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vio.c,v 1.40 2024/06/10 19:26:17 jan Exp $ */ +/* $OpenBSD: if_vio.c,v 1.41 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2012 Stefan Fritsch, Alexander Fiveg. @@ -524,7 +524,8 @@ vio_put_lladdr(struct arpcom *ac, struct virtio_softc *vsc) } } -static int vio_needs_reset(struct vio_softc *sc) +static int +vio_needs_reset(struct vio_softc *sc) { if (virtio_get_status(sc->sc_virtio) & VIRTIO_CONFIG_DEVICE_STATUS_DEVICE_NEEDS_RESET) { diff --git a/sys/dev/pv/vioblk.c b/sys/dev/pv/vioblk.c index 5b657fab336..6b5f56cd7b7 100644 --- a/sys/dev/pv/vioblk.c +++ b/sys/dev/pv/vioblk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vioblk.c,v 1.38 2024/05/24 10:05:55 jsg Exp $ */ +/* $OpenBSD: vioblk.c,v 1.39 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2012 Stefan Fritsch. @@ -150,7 +150,8 @@ const struct scsi_adapter vioblk_switch = { vioblk_scsi_cmd, NULL, NULL, NULL, NULL }; -int vioblk_match(struct device *parent, void *match, void *aux) +int +vioblk_match(struct device *parent, void *match, void *aux) { struct virtio_softc *va = aux; if (va->sc_childdevid == PCI_PRODUCT_VIRTIO_BLOCK) diff --git a/sys/dev/pv/viocon.c b/sys/dev/pv/viocon.c index 112e317fe5a..e81bc952004 100644 --- a/sys/dev/pv/viocon.c +++ b/sys/dev/pv/viocon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viocon.c,v 1.11 2024/05/24 10:05:55 jsg Exp $ */ +/* $OpenBSD: viocon.c,v 1.12 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2013-2015 Stefan Fritsch @@ -159,7 +159,8 @@ dev2port(dev_t dev) return dev2sc(dev)->sc_ports[VIOCONPORT(dev)]; } -int viocon_match(struct device *parent, void *match, void *aux) +int +viocon_match(struct device *parent, void *match, void *aux) { struct virtio_softc *va = aux; if (va->sc_childdevid == PCI_PRODUCT_VIRTIO_CONSOLE) diff --git a/sys/dev/pv/viornd.c b/sys/dev/pv/viornd.c index 54c0640ec2c..cc652ba5ed7 100644 --- a/sys/dev/pv/viornd.c +++ b/sys/dev/pv/viornd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viornd.c,v 1.8 2024/05/24 10:05:55 jsg Exp $ */ +/* $OpenBSD: viornd.c,v 1.9 2024/06/26 01:40:49 jsg Exp $ */ /* * Copyright (c) 2014 Stefan Fritsch @@ -69,8 +69,8 @@ struct cfdriver viornd_cd = { NULL, "viornd", DV_DULL }; - -int viornd_match(struct device *parent, void *match, void *aux) +int +viornd_match(struct device *parent, void *match, void *aux) { struct virtio_softc *va = aux; if (va->sc_childdevid == PCI_PRODUCT_VIRTIO_ENTROPY) diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c index e0d6cd2ab2f..f923e6da3a7 100644 --- a/sys/dev/wscons/wsmouse.c +++ b/sys/dev/wscons/wsmouse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmouse.c,v 1.72 2024/05/17 20:11:58 miod Exp $ */ +/* $OpenBSD: wsmouse.c,v 1.73 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: wsmouse.c,v 1.35 2005/02/27 00:27:52 perry Exp $ */ /* @@ -1622,7 +1622,8 @@ wsmouse_set_mode(struct device *sc, int mode) return (-1); } -struct wsmousehw *wsmouse_get_hw(struct device *sc) +struct wsmousehw * +wsmouse_get_hw(struct device *sc) { return &((struct wsmouse_softc *) sc)->sc_input.hw; } diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index a2104b989f5..dd90a719f88 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.151 2023/12/14 14:04:57 claudio Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.152 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -54,7 +54,8 @@ static #ifndef SMALL_KERNEL __inline__ #endif -long BUCKETINDX(size_t sz) +long +BUCKETINDX(size_t sz) { long b, d; diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c index 7b5d260ea95..ba194a5fec4 100644 --- a/sys/net/if_pppoe.c +++ b/sys/net/if_pppoe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppoe.c,v 1.83 2022/07/14 11:03:15 mvs Exp $ */ +/* $OpenBSD: if_pppoe.c,v 1.84 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */ /* @@ -188,7 +188,8 @@ struct mbuf_queue pppoediscinq = MBUF_QUEUE_INITIALIZER( struct mbuf_queue pppoeinq = MBUF_QUEUE_INITIALIZER( IFQ_MAXLEN, IPL_SOFTNET); -void pppoeintr(void) +void +pppoeintr(void) { struct mbuf_list ml; struct mbuf *m; diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index 4e6b0f0edf1..9ec5db001f7 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_syscalls.c,v 1.126 2024/05/01 13:15:59 jsg Exp $ */ +/* $OpenBSD: nfs_syscalls.c,v 1.127 2024/06/26 01:40:49 jsg Exp $ */ /* $NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $ */ /* @@ -302,7 +302,8 @@ nfssvc_addsock(struct file *fp, struct mbuf *mynam) return (0); } -static inline int nfssvc_checknam(struct mbuf *nam) +static inline int +nfssvc_checknam(struct mbuf *nam) { struct sockaddr_in *sin; -- 2.20.1