diff options
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/acpi/dsdt.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/adv.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/adw.c | 6 | ||||
-rw-r--r-- | sys/dev/ic/ami.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/rt2860.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/rtwn.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/ti.c | 6 | ||||
-rw-r--r-- | sys/dev/pci/auixp.c | 12 | ||||
-rw-r--r-- | sys/dev/pci/drm/i915/i915_driver.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/maestro.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/vmwpvs.c | 6 | ||||
-rw-r--r-- | sys/dev/usb/ubsa.c | 4 |
12 files changed, 30 insertions, 30 deletions
diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c index d179cfdd136..78b10be0ea0 100644 --- a/sys/dev/acpi/dsdt.c +++ b/sys/dev/acpi/dsdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsdt.c,v 1.270 2024/08/06 17:38:56 kettenis Exp $ */ +/* $OpenBSD: dsdt.c,v 1.271 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> * @@ -1731,7 +1731,7 @@ aml_val_to_string(const struct aml_value *val) default: snprintf(buffer, sizeof(buffer), "Failed to convert type %d to string!", val->type); - }; + } return (buffer); } diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c index e32f1da5b26..fdc232da655 100644 --- a/sys/dev/ic/adv.c +++ b/sys/dev/ic/adv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adv.c,v 1.53 2022/04/16 19:19:58 naddy Exp $ */ +/* $OpenBSD: adv.c,v 1.54 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */ /* @@ -468,7 +468,7 @@ adv_attach(ASC_SOFTC *sc) */ error = adv_alloc_ccbs(sc); if (error) - return; /* (error) */ ; + return; /* (error) */ /* * Create and initialize the Control Blocks. diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c index e91d2b24586..33e253ed3e9 100644 --- a/sys/dev/ic/adw.c +++ b/sys/dev/ic/adw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adw.c,v 1.70 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: adw.c,v 1.71 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */ /* @@ -423,7 +423,7 @@ adw_attach(ADW_SOFTC *sc) */ error = adw_alloc_controls(sc); if (error) - return; /* (error) */ ; + return; /* (error) */ /* * Create and initialize the Control Blocks. @@ -444,7 +444,7 @@ adw_attach(ADW_SOFTC *sc) */ error = adw_alloc_carriers(sc); if (error) - return; /* (error) */ ; + return; /* (error) */ /* * Zero's the freeze_device status diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index 98195eccd6c..8833497c885 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.263 2024/06/26 01:40:49 jsg Exp $ */ +/* $OpenBSD: ami.c,v 1.264 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -1772,7 +1772,7 @@ ami_mgmt(struct ami_softc *sc, u_int8_t opcode, u_int8_t par1, u_int8_t par2, cmd->acc_io.aio_param = par2; cmd->acc_io.aio_pad[0] = par3; break; - }; + } cmd->acc_io.aio_data = am ? htole32(AMIMEM_DVA(am)) : 0; diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c index 1bab22ffac2..07aeeff7171 100644 --- a/sys/dev/ic/rt2860.c +++ b/sys/dev/ic/rt2860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860.c,v 1.103 2024/04/14 03:26:25 jsg Exp $ */ +/* $OpenBSD: rt2860.c,v 1.104 2024/09/20 02:00:46 jsg Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -3271,7 +3271,7 @@ rt2860_read_eeprom(struct rt2860_softc *sc) sc->ext_5ghz_lna = (val >> 3) & 1; sc->ext_2ghz_lna = (val >> 2) & 1; /* check if RF supports automatic Tx access gain control */ - sc->calib_2ghz = sc->calib_5ghz = 0; /* XXX (val >> 1) & 1 */; + sc->calib_2ghz = sc->calib_5ghz = 0; /* XXX (val >> 1) & 1 */ /* check if we have a hardware radio switch */ sc->rfswitch = val & 1; } diff --git a/sys/dev/ic/rtwn.c b/sys/dev/ic/rtwn.c index 3df98b19fa7..0bc314e7d56 100644 --- a/sys/dev/ic/rtwn.c +++ b/sys/dev/ic/rtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtwn.c,v 1.58 2024/06/26 01:40:49 jsg Exp $ */ +/* $OpenBSD: rtwn.c,v 1.59 2024/09/20 02:00:46 jsg Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -2536,7 +2536,7 @@ rtwn_set_chan(struct rtwn_softc *sc, struct ieee80211_channel *c, rtwn_rf_write(sc, i, 0x87, 0x65); rtwn_rf_write(sc, i, 0x1c, 0); rtwn_rf_write(sc, i, 0xdf, 0x0140); - rtwn_rf_write(sc, i, 0x1b, 0x1c6c);; + rtwn_rf_write(sc, i, 0x1b, 0x1c6c); } } } diff --git a/sys/dev/ic/ti.c b/sys/dev/ic/ti.c index c1cc0df7d05..1aae1d1f148 100644 --- a/sys/dev/ic/ti.c +++ b/sys/dev/ic/ti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ti.c,v 1.30 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: ti.c,v 1.31 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -781,7 +781,7 @@ ti_init_rx_ring_jumbo(struct ti_softc *sc) for (i = 0; i < TI_JUMBO_RX_RING_CNT; i++) { if (ti_newbuf_jumbo(sc, i, NULL, 0) == ENOBUFS) return (ENOBUFS); - }; + } TI_UPDATE_JUMBOPROD(sc, i - 1); sc->ti_jumbo = i - 1; @@ -812,7 +812,7 @@ ti_init_rx_ring_mini(struct ti_softc *sc) for (i = 0; i < TI_MSLOTS; i++) { if (ti_newbuf_mini(sc, i, NULL, 0) == ENOBUFS) return (ENOBUFS); - }; + } TI_UPDATE_MINIPROD(sc, i - 1); sc->ti_mini = i - 1; diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c index 9cd54932dbc..74db46167f3 100644 --- a/sys/dev/pci/auixp.c +++ b/sys/dev/pci/auixp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auixp.c,v 1.54 2024/08/18 14:42:56 deraadt Exp $ */ +/* $OpenBSD: auixp.c,v 1.55 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */ /* @@ -145,7 +145,7 @@ void auixp_dma_update(struct auixp_softc *, struct auixp_dma *); void auixp_update_busbusy(struct auixp_softc *); #ifdef DEBUG_AUIXP -#define DPRINTF(x) printf x; +#define DPRINTF(x) printf x #else #define DPRINTF(x) #endif @@ -1383,7 +1383,7 @@ auixp_reset_aclink(struct auixp_softc *sc) /* have to wait at least 10 usec for it to initialise */ DELAY(20); - }; + } printf("%s: soft resetting aclink\n", sc->sc_dev.dv_xname); @@ -1427,15 +1427,15 @@ auixp_reset_aclink(struct auixp_softc *sc) timeout--; if (timeout == 0) break; - }; + } if (timeout == 0) { printf("%s: giving up aclink reset\n", sc->sc_dev.dv_xname); - }; + } if (timeout != 10) { printf("%s: aclink hardware reset successful\n", sc->sc_dev.dv_xname); - }; + } /* assert reset and sync for safety */ value = bus_space_read_4(iot, ioh, ATI_REG_CMD); diff --git a/sys/dev/pci/drm/i915/i915_driver.c b/sys/dev/pci/drm/i915/i915_driver.c index 00ab1ef519b..5e3629934d6 100644 --- a/sys/dev/pci/drm/i915/i915_driver.c +++ b/sys/dev/pci/drm/i915/i915_driver.c @@ -2274,7 +2274,7 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux) & (PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE)) == (PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE)) { dev_priv->primary = 1; - dev_priv->console = vga_is_console(pa->pa_iot, -1);; + dev_priv->console = vga_is_console(pa->pa_iot, -1); vga_console_attached = 1; } diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c index f87067e5e56..865f5743330 100644 --- a/sys/dev/pci/maestro.c +++ b/sys/dev/pci/maestro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: maestro.c,v 1.55 2024/09/04 07:54:52 mglocker Exp $ */ +/* $OpenBSD: maestro.c,v 1.56 2024/09/20 02:00:46 jsg Exp $ */ /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */ /* * FreeBSD's ESS Agogo/Maestro driver @@ -627,7 +627,7 @@ maestro_attach(struct device *parent, struct device *self, void *aux) 0, &sc->iot, &sc->ioh, NULL, NULL, 0)) != 0) { printf(", can't map i/o space\n"); goto bad; - }; + } /* Allocate fixed DMA segment :-( */ sc->dmasize = MAESTRO_BUFSIZ * 16; diff --git a/sys/dev/pci/vmwpvs.c b/sys/dev/pci/vmwpvs.c index 6ac67d1db4a..84d0a0d85d6 100644 --- a/sys/dev/pci/vmwpvs.c +++ b/sys/dev/pci/vmwpvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmwpvs.c,v 1.29 2024/09/04 07:54:52 mglocker Exp $ */ +/* $OpenBSD: vmwpvs.c,v 1.30 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2013 David Gwynne <dlg@openbsd.org> @@ -799,7 +799,7 @@ vmwpvs_msg_task(void *xsc) printf("%s: error probing target %d lun %d\n", DEVNAME(sc), letoh32(dvmsg->target), dvmsg->lun[1]); - }; + } break; case VMWPVS_MSG_T_REMOVED: @@ -817,7 +817,7 @@ vmwpvs_msg_task(void *xsc) printf("%s: error detaching target %d lun %d\n", DEVNAME(sc), letoh32(dvmsg->target), dvmsg->lun[1]); - }; + } break; default: diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index d1921deb04f..aa778437c9a 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.70 2024/05/23 03:21:09 jsg Exp $ */ +/* $OpenBSD: ubsa.c,v 1.71 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. @@ -478,7 +478,7 @@ ubsa_baudrate(struct ubsa_softc *sc, speed_t speed) sc->sc_dev.dv_xname)); value = B230400 / B9600; break; - }; + } if (speed == B0) { ubsa_flow(sc, 0, 0); |