summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/ata_wdc.c12
-rw-r--r--sys/dev/atapiscsi/atapiscsi.c8
-rw-r--r--sys/dev/ic/ar5210.c4
-rw-r--r--sys/dev/ic/ar5211.c4
-rw-r--r--sys/dev/ic/ar5212.c4
-rw-r--r--sys/dev/ic/isp_target.c4
-rw-r--r--sys/dev/ic/pdq.c6
-rw-r--r--sys/dev/isa/fd.c6
-rw-r--r--sys/dev/pci/if_de.c6
-rw-r--r--sys/dev/wscons/wsdisplay.c4
10 files changed, 29 insertions, 29 deletions
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index 38d14e9fd40..a88f5b23406 100644
--- a/sys/dev/ata/ata_wdc.c
+++ b/sys/dev/ata/ata_wdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ata_wdc.c,v 1.29 2006/10/04 00:52:55 krw Exp $ */
+/* $OpenBSD: ata_wdc.c,v 1.30 2007/02/14 00:53:47 jsg Exp $ */
/* $NetBSD: ata_wdc.c,v 1.21 1999/08/09 09:43:11 bouyer Exp $ */
/*
@@ -559,7 +559,7 @@ again:
chp->wdc->irqack(chp);
if (chp->ch_status & (WDCS_ERR | WDCS_DWF))
goto error;
- /* fall through */
+ /* FALLTHROUGH */
case PIOMODE:
/* Don't try to set modes if controller can't be adjusted */
@@ -584,7 +584,7 @@ again:
chp->wdc->irqack(chp);
if (chp->ch_status & (WDCS_ERR | WDCS_DWF))
goto error;
- /* fall through */
+ /* FALLTHROUGH */
case DMAMODE:
if (drvp->drive_flags & DRIVE_UDMA) {
@@ -606,7 +606,7 @@ again:
chp->wdc->irqack(chp);
if (chp->ch_status & (WDCS_ERR | WDCS_DWF))
goto error;
- /* fall through */
+ /* FALLTHROUGH */
case GEOMETRY:
geometry:
@@ -628,7 +628,7 @@ again:
chp->wdc->irqack(chp);
if (chp->ch_status & (WDCS_ERR | WDCS_DWF))
goto error;
- /* fall through */
+ /* FALLTHROUGH */
case MULTIMODE:
multimode:
@@ -647,7 +647,7 @@ again:
chp->wdc->irqack(chp);
if (chp->ch_status & (WDCS_ERR | WDCS_DWF))
goto error;
- /* fall through */
+ /* FALLTHROUGH */
case READY:
ready:
diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c
index a93222ca4b6..cfd0c2084ad 100644
--- a/sys/dev/atapiscsi/atapiscsi.c
+++ b/sys/dev/atapiscsi/atapiscsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atapiscsi.c,v 1.76 2006/11/28 23:59:45 dlg Exp $ */
+/* $OpenBSD: atapiscsi.c,v 1.77 2007/02/14 00:53:47 jsg Exp $ */
/*
* This code is derived from code with the copyright below.
@@ -1429,7 +1429,7 @@ wdc_atapi_ctrl(chp, xfer, timeout, ret)
break;
case ATAPI_DEVICE_RESET_WAIT_STATE:
- /* fall through */
+ /* FALLTHROUGH */
case ATAPI_IDENTIFY_STATE:
wdccommandshort(chp, drvp->drive, ATAPI_IDENTIFY_DEVICE);
@@ -1482,7 +1482,7 @@ wdc_atapi_ctrl(chp, xfer, timeout, ret)
drvp->PIO_mode = 3;
chp->wdc->set_modes(chp);
}
- /* fall through */
+ /* FALLTHROUGH */
case ATAPI_DMAMODE_STATE:
if (drvp->drive_flags & DRIVE_UDMA) {
@@ -1505,7 +1505,7 @@ wdc_atapi_ctrl(chp, xfer, timeout, ret)
chp->wdc->irqack(chp);
if (chp->ch_status & WDCS_ERR)
drvp->drive_flags &= ~(DRIVE_DMA | DRIVE_UDMA);
- /* fall through */
+ /* FALLTHROUGH */
case ATAPI_READY_STATE:
ready:
diff --git a/sys/dev/ic/ar5210.c b/sys/dev/ic/ar5210.c
index 6da434be2fa..d6830c39bf8 100644
--- a/sys/dev/ic/ar5210.c
+++ b/sys/dev/ic/ar5210.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5210.c,v 1.33 2005/12/18 17:59:58 reyk Exp $ */
+/* $OpenBSD: ar5210.c,v 1.34 2007/02/14 00:53:48 jsg Exp $ */
/*
* Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -1869,7 +1869,7 @@ ar5k_ar5210_set_power(struct ath_hal *hal, HAL_POWER_MODE mode,
switch (mode) {
case HAL_PM_AUTO:
staid &= ~AR5K_AR5210_STA_ID1_DEFAULT_ANTENNA;
- /* fallthrough */
+ /* FALLTHROUGH */
case HAL_PM_NETWORK_SLEEP:
if (set_chip == AH_TRUE) {
AR5K_REG_WRITE(AR5K_AR5210_SCR,
diff --git a/sys/dev/ic/ar5211.c b/sys/dev/ic/ar5211.c
index bbbb593270f..34fa1e7fdf5 100644
--- a/sys/dev/ic/ar5211.c
+++ b/sys/dev/ic/ar5211.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5211.c,v 1.28 2006/09/19 16:42:29 reyk Exp $ */
+/* $OpenBSD: ar5211.c,v 1.29 2007/02/14 00:53:48 jsg Exp $ */
/*
* Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -1974,7 +1974,7 @@ ar5k_ar5211_set_power(struct ath_hal *hal, HAL_POWER_MODE mode,
switch (mode) {
case HAL_PM_AUTO:
staid &= ~AR5K_AR5211_STA_ID1_DEFAULT_ANTENNA;
- /* fallthrough */
+ /* FALLTHROUGH */
case HAL_PM_NETWORK_SLEEP:
if (set_chip == AH_TRUE) {
AR5K_REG_WRITE(AR5K_AR5211_SCR,
diff --git a/sys/dev/ic/ar5212.c b/sys/dev/ic/ar5212.c
index 2aa525dcb0c..5152ba3e220 100644
--- a/sys/dev/ic/ar5212.c
+++ b/sys/dev/ic/ar5212.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5212.c,v 1.34 2006/12/14 09:23:24 reyk Exp $ */
+/* $OpenBSD: ar5212.c,v 1.35 2007/02/14 00:53:48 jsg Exp $ */
/*
* Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -2306,7 +2306,7 @@ ar5k_ar5212_set_power(struct ath_hal *hal, HAL_POWER_MODE mode,
switch (mode) {
case HAL_PM_AUTO:
staid &= ~AR5K_AR5212_STA_ID1_DEFAULT_ANTENNA;
- /* fallthrough */
+ /* FALLTHROUGH */
case HAL_PM_NETWORK_SLEEP:
if (set_chip == AH_TRUE) {
AR5K_REG_WRITE(AR5K_AR5212_SCR,
diff --git a/sys/dev/ic/isp_target.c b/sys/dev/ic/isp_target.c
index 9e0b09f50d4..24c0e1c6035 100644
--- a/sys/dev/ic/isp_target.c
+++ b/sys/dev/ic/isp_target.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_target.c,v 1.13 2003/10/21 18:58:49 jmc Exp $ */
+/* $OpenBSD: isp_target.c,v 1.14 2007/02/14 00:53:48 jsg Exp $ */
/*
* Machine and OS Independent Target Mode Code for the Qlogic SCSI/FC adapters.
*
@@ -1047,7 +1047,7 @@ isp_handle_ctio2(struct ispsoftc *isp, ct2_entry_t *ct)
switch(ct->ct_status & ~QLTM_SVALID) {
case CT_BUS_ERROR:
isp_prt(isp, ISP_LOGERR, "PCI DMA Bus Error");
- /* FALL Through */
+ /* FALLTHROUGH */
case CT_DATA_OVER:
case CT_DATA_UNDER:
case CT_OK:
diff --git a/sys/dev/ic/pdq.c b/sys/dev/ic/pdq.c
index 7cf5beaf8da..2a67671be96 100644
--- a/sys/dev/ic/pdq.c
+++ b/sys/dev/ic/pdq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pdq.c,v 1.12 2002/06/02 22:49:59 deraadt Exp $ */
+/* $OpenBSD: pdq.c,v 1.13 2007/02/14 00:53:48 jsg Exp $ */
/* $NetBSD: pdq.c,v 1.9 1996/10/13 01:37:26 christos Exp $ */
/*-
@@ -999,7 +999,7 @@ pdq_stop(
pdq_do_port_control(csrs, PDQ_PCTL_SUB_CMD);
state = PDQ_PSTS_ADAPTER_STATE(PDQ_CSR_READ(csrs, csr_port_status));
PDQ_ASSERT(state == PDQS_DMA_AVAILABLE);
- /* FALL THROUGH */
+ /* FALLTHROUGH */
}
case PDQS_DMA_AVAILABLE: {
PDQ_CSR_WRITE(csrs, csr_port_data_a, 0);
@@ -1007,7 +1007,7 @@ pdq_stop(
pdq_do_port_control(csrs, PDQ_PCTL_DMA_UNINIT);
state = PDQ_PSTS_ADAPTER_STATE(PDQ_CSR_READ(csrs, csr_port_status));
PDQ_ASSERT(state == PDQS_DMA_UNAVAILABLE);
- /* FALL THROUGH */
+ /* FALLTHROUGH */
}
case PDQS_DMA_UNAVAILABLE: {
break;
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index eaaf04a3ceb..89722be6b6e 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.58 2006/12/21 02:28:47 krw Exp $ */
+/* $OpenBSD: fd.c,v 1.59 2007/02/14 00:53:48 jsg Exp $ */
/* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */
/*-
@@ -669,7 +669,7 @@ loop:
/* Make sure the right drive is selected. */
fd_set_motor(fdc, 0);
- /* fall through */
+ /* FALLTHROUGH */
case DOSEEK:
doseek:
if (fd->sc_cylin == bp->b_cylinder)
@@ -842,7 +842,7 @@ loop:
(void) fdcresult(fdc);
}
- /* fall through */
+ /* FALLTHROUGH */
case DORECAL:
out_fdc(iot, ioh, NE7CMD_RECAL); /* recal function */
out_fdc(iot, ioh, fd->sc_drive);
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 3973edf19a4..bc9d0657b66 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_de.c,v 1.96 2006/07/08 04:15:36 brad Exp $ */
+/* $OpenBSD: if_de.c,v 1.97 2007/02/14 00:53:48 jsg Exp $ */
/* $NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $ */
/*-
@@ -1292,7 +1292,7 @@ tulip_mii_autonegotiate(tulip_softc_t * const sc, const unsigned phyaddr)
sc->tulip_probe_timeout = 3000;
sc->tulip_intrmask |= TULIP_STS_ABNRMLINTR|TULIP_STS_NORMALINTR;
sc->tulip_probe_state = TULIP_PROBE_PHYRESET;
- /* FALL THROUGH */
+ /* FALLTHROUGH */
}
case TULIP_PROBE_PHYRESET: {
u_int32_t status;
@@ -1338,7 +1338,7 @@ tulip_mii_autonegotiate(tulip_softc_t * const sc, const unsigned phyaddr)
#endif
sc->tulip_probe_state = TULIP_PROBE_PHYAUTONEG;
sc->tulip_probe_timeout = 3000;
- /* FALL THROUGH */
+ /* FALLTHROUGH */
}
case TULIP_PROBE_PHYAUTONEG: {
u_int32_t status = tulip_mii_readreg(sc, phyaddr, PHYREG_STATUS)
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index d3a17233f2d..89b2ff521fb 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.75 2007/01/07 13:28:04 miod Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.76 2007/02/14 00:53:48 jsg Exp $ */
/* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
/*
@@ -1304,7 +1304,7 @@ wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
if (d->idx == -1 && d->type == WSMUX_KBD)
d->idx = wskbd_pickfree();
#undef d
- /* fall into */
+ /* FALLTHROUGH */
case WSMUXIO_INJECTEVENT:
case WSMUXIO_REMOVE_DEVICE:
case WSMUXIO_LIST_DEVICES:
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.