diff options
| author | mrg <mrg@NetBSD.org> | 2019-02-03 03:19:25 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2019-02-03 03:19:25 +0000 |
| commit | 788768547b3857c4a91dd4dfdf8fc4ffe855cddc (patch) | |
| tree | 05c0bb3274b13ebb5db25e521a19b68688a65067 /sys/dev | |
| parent | 347959000863b79ceb826308162ed125f4a420ac (diff) | |
- add or adjust /* FALLTHROUGH */ where appropriate
- add __unreachable() after functions that can return but won't in
this case, and thus can't be marked __dead easily
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/acpi_cpu_cstate.c | 7 | ||||
| -rw-r--r-- | sys/dev/bluetooth/btsco.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/adwlib.c | 7 | ||||
| -rw-r--r-- | sys/dev/ic/elink3.c | 5 | ||||
| -rw-r--r-- | sys/dev/ic/isp_netbsd.c | 5 | ||||
| -rw-r--r-- | sys/dev/ic/ncr53c9x.c | 7 | ||||
| -rw-r--r-- | sys/dev/ic/pdq_ifsubr.c | 58 | ||||
| -rw-r--r-- | sys/dev/ic/rtw.c | 5 | ||||
| -rw-r--r-- | sys/dev/isa/fd.c | 5 | ||||
| -rw-r--r-- | sys/dev/isa/gus.c | 5 | ||||
| -rw-r--r-- | sys/dev/isa/if_ate.c | 5 | ||||
| -rw-r--r-- | sys/dev/isa/sbdsp.c | 18 | ||||
| -rw-r--r-- | sys/dev/pci/bktr/bktr_core.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/if_bce.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/if_bge.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_dge.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/if_ipw.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwi.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_msk.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/if_sk.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/mpii.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/pdcsata.c | 5 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_ray.c | 6 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmcia_cis.c | 5 | ||||
| -rw-r--r-- | sys/dev/scsipi/atapi_base.c | 5 | ||||
| -rw-r--r-- | sys/dev/scsipi/st.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/umass.c | 16 | ||||
| -rw-r--r-- | sys/dev/usb/usb.c | 7 | ||||
| -rw-r--r-- | sys/dev/wscons/wsdisplay.c | 6 |
29 files changed, 141 insertions, 105 deletions
diff --git a/sys/dev/acpi/acpi_cpu_cstate.c b/sys/dev/acpi/acpi_cpu_cstate.c index f717ebf0ea0..d0f6902a30b 100644 --- a/sys/dev/acpi/acpi_cpu_cstate.c +++ b/sys/dev/acpi/acpi_cpu_cstate.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_cstate.c,v 1.59 2012/02/25 17:22:52 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_cstate.c,v 1.60 2019/02/03 03:19:27 mrg Exp $ */ /*- * Copyright (c) 2010, 2011 Jukka Ruohonen <jruohonen@iki.fi> @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.59 2012/02/25 17:22:52 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.60 2019/02/03 03:19:27 mrg Exp $"); #include <sys/param.h> #include <sys/cpu.h> @@ -348,9 +348,10 @@ acpicpu_cstate_cst_add(struct acpicpu_softc *sc, ACPI_OBJECT *elm) break; - case ACPI_STATE_C3: /* FALLTHROUGH */ + case ACPI_STATE_C3: state.cs_flags = ACPICPU_FLAG_C_BM_STS; + /* FALLTHROUGH */ default: if ((sc->sc_flags & ACPICPU_FLAG_C_FFH) == 0) { diff --git a/sys/dev/bluetooth/btsco.c b/sys/dev/bluetooth/btsco.c index 36d11a31a8d..633c1d814fb 100644 --- a/sys/dev/bluetooth/btsco.c +++ b/sys/dev/bluetooth/btsco.c @@ -1,4 +1,4 @@ -/* $NetBSD: btsco.c,v 1.36 2017/06/01 02:45:09 chs Exp $ */ +/* $NetBSD: btsco.c,v 1.37 2019/02/03 03:19:27 mrg Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.36 2017/06/01 02:45:09 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.37 2019/02/03 03:19:27 mrg Exp $"); #include <sys/param.h> #include <sys/audioio.h> @@ -632,7 +632,7 @@ btsco_open(void *hdl, int flags) case BTSCO_CLOSED: /* disconnected */ err = sc->sc_err; - /* fall through to */ + /* FALLTHROUGH */ case BTSCO_WAIT_CONNECT: /* error */ if (sc->sc_sco != NULL) sco_detach_pcb(&sc->sc_sco); diff --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c index 2f66f6faf78..d0e7ace2f6d 100644 --- a/sys/dev/ic/adwlib.c +++ b/sys/dev/ic/adwlib.c @@ -1,4 +1,4 @@ -/* $NetBSD: adwlib.c,v 1.41 2013/09/12 11:23:37 martin Exp $ */ +/* $NetBSD: adwlib.c,v 1.42 2019/02/03 03:19:27 mrg Exp $ */ /* * Low level routines for the Advanced Systems Inc. SCSI controllers chips @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.41 2013/09/12 11:23:37 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.42 2019/02/03 03:19:27 mrg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -463,12 +463,15 @@ XXX TODO!!! if (ASC_PCI_ID2FUNC(sc->cfg.pci_slot_info) != 0) { case 3: /* Enable manual control with low on / high on. */ sc->cfg.termination |= ADW_TERM_CTL_L; + /* FALLTHROUGH */ case 2: /* Enable manual control with low off / high on. */ sc->cfg.termination |= ADW_TERM_CTL_H; + /* FALLTHROUGH */ case 1: /* Enable manual control with low off / high off. */ sc->cfg.termination |= ADW_TERM_CTL_SEL; + /* FALLTHROUGH */ case 0: break; default: diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c index 1e01b643df0..27f959bd1c9 100644 --- a/sys/dev/ic/elink3.c +++ b/sys/dev/ic/elink3.c @@ -1,4 +1,4 @@ -/* $NetBSD: elink3.c,v 1.144 2019/01/22 03:42:26 msaitoh Exp $ */ +/* $NetBSD: elink3.c,v 1.145 2019/02/03 03:19:27 mrg Exp $ */ /*- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.144 2019/01/22 03:42:26 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.145 2019/02/03 03:19:27 mrg Exp $"); #include "opt_inet.h" @@ -1683,6 +1683,7 @@ epioctl(struct ifnet *ifp, u_long cmd, void *data) break; } + /* FALLTHROUGH */ default: error = ether_ioctl(ifp, cmd, data); diff --git a/sys/dev/ic/isp_netbsd.c b/sys/dev/ic/isp_netbsd.c index 9c018a0bffa..ec7a487fae6 100644 --- a/sys/dev/ic/isp_netbsd.c +++ b/sys/dev/ic/isp_netbsd.c @@ -1,4 +1,4 @@ -/* $NetBSD: isp_netbsd.c,v 1.90 2018/09/03 16:29:31 riastradh Exp $ */ +/* $NetBSD: isp_netbsd.c,v 1.91 2019/02/03 03:19:27 mrg Exp $ */ /* * Platform (NetBSD) dependent common attachment code for Qlogic adapters. */ @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.90 2018/09/03 16:29:31 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.91 2019/02/03 03:19:27 mrg Exp $"); #include <dev/ic/isp_netbsd.h> #include <dev/ic/isp_ioctl.h> @@ -1217,6 +1217,7 @@ isp_async(struct ispsoftc *isp, ispasync_t cmd, ...) ASYNC_EVENT_XFER_MODE, &xm); break; } + /* FALLTHROUGH */ case ISPASYNC_BUS_RESET: va_start(ap, cmd); bus = va_arg(ap, int); diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c index a96dd6f5e8e..054cc175ca0 100644 --- a/sys/dev/ic/ncr53c9x.c +++ b/sys/dev/ic/ncr53c9x.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr53c9x.c,v 1.149 2018/09/03 16:29:31 riastradh Exp $ */ +/* $NetBSD: ncr53c9x.c,v 1.150 2019/02/03 03:19:27 mrg Exp $ */ /*- * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.149 2018/09/03 16:29:31 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.150 2019/02/03 03:19:27 mrg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -372,6 +372,7 @@ ncr53c9x_reset(struct ncr53c9x_softc *sc) case NCR_VARIANT_FAS408: NCR_WRITE_REG(sc, NCR_CFG5, sc->sc_cfg5 | NCRCFG5_SINT); NCR_WRITE_REG(sc, NCR_CFG4, sc->sc_cfg4); + /* FALLTHROUGH */ case NCR_VARIANT_AM53C974: case NCR_VARIANT_FAS216: case NCR_VARIANT_NCR53C94: @@ -379,9 +380,11 @@ ncr53c9x_reset(struct ncr53c9x_softc *sc) case NCR_VARIANT_ESP200: sc->sc_features |= NCR_F_HASCFG3; NCR_WRITE_REG(sc, NCR_CFG3, sc->sc_cfg3); + /* FALLTHROUGH */ case NCR_VARIANT_ESP100A: sc->sc_features |= NCR_F_SELATN3; NCR_WRITE_REG(sc, NCR_CFG2, sc->sc_cfg2); + /* FALLTHROUGH */ case NCR_VARIANT_ESP100: NCR_WRITE_REG(sc, NCR_CFG1, sc->sc_cfg1); NCR_WRITE_REG(sc, NCR_CCF, sc->sc_ccf); diff --git a/sys/dev/ic/pdq_ifsubr.c b/sys/dev/ic/pdq_ifsubr.c index 6d02e5f2d9f..4e305efc729 100644 --- a/sys/dev/ic/pdq_ifsubr.c +++ b/sys/dev/ic/pdq_ifsubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: pdq_ifsubr.c,v 1.60 2018/06/26 06:48:00 msaitoh Exp $ */ +/* $NetBSD: pdq_ifsubr.c,v 1.61 2019/02/03 03:19:27 mrg Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.60 2018/06/26 06:48:00 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.61 2019/02/03 03:19:27 mrg Exp $"); #ifdef __NetBSD__ #include "opt_inet.h" @@ -609,55 +609,43 @@ pdq_os_memalloc_contig( } switch (steps) { - case 11: { + case 11: bus_dmamap_unload(sc->sc_dmatag, sc->sc_cbmap); - /* FALL THROUGH */ - } - case 10: { + /* FALLTHROUGH */ + case 10: bus_dmamap_destroy(sc->sc_dmatag, sc->sc_cbmap); - /* FALL THROUGH */ - } - case 9: { + /* FALLTHROUGH */ + case 9: bus_dmamem_unmap(sc->sc_dmatag, (void *)pdq->pdq_cbp, sizeof(*pdq->pdq_cbp)); - /* FALL THROUGH */ - } - case 8: { + /* FALLTHROUGH */ + case 8: bus_dmamap_unload(sc->sc_dmatag, sc->sc_uimap); - /* FALL THROUGH */ - } - case 7: { + /* FALLTHROUGH */ + case 7: bus_dmamap_destroy(sc->sc_dmatag, sc->sc_uimap); - /* FALL THROUGH */ - } - case 6: { + /* FALLTHROUGH */ + case 6: bus_dmamem_unmap(sc->sc_dmatag, (void *) pdq->pdq_unsolicited_info.ui_events, PDQ_OS_PAGESIZE); - /* FALL THROUGH */ - } - case 5: { + /* FALLTHROUGH */ + case 5: bus_dmamem_free(sc->sc_dmatag, ui_segs, ui_nsegs); - /* FALL THROUGH */ - } - case 4: { + /* FALLTHROUGH */ + case 4: bus_dmamap_unload(sc->sc_dmatag, sc->sc_dbmap); - /* FALL THROUGH */ - } - case 3: { + /* FALLTHROUGH */ + case 3: bus_dmamap_destroy(sc->sc_dmatag, sc->sc_dbmap); - /* FALL THROUGH */ - } - case 2: { + /* FALLTHROUGH */ + case 2: bus_dmamem_unmap(sc->sc_dmatag, (void *) pdq->pdq_dbp, sizeof(*pdq->pdq_dbp)); - /* FALL THROUGH */ - } - case 1: { + /* FALLTHROUGH */ + case 1: bus_dmamem_free(sc->sc_dmatag, db_segs, db_nsegs); - /* FALL THROUGH */ - } } return not_ok; diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index 29afaf6ea52..4a59894794a 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtw.c,v 1.128 2018/06/26 06:48:00 msaitoh Exp $ */ +/* $NetBSD: rtw.c,v 1.129 2019/02/03 03:19:27 mrg Exp $ */ /*- * Copyright (c) 2004, 2005, 2006, 2007 David Young. All rights * reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.128 2018/06/26 06:48:00 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.129 2019/02/03 03:19:27 mrg Exp $"); #include <sys/param.h> @@ -4281,6 +4281,7 @@ rtw_detach(struct rtw_softc *sc) callout_stop(&sc->sc_scan_ch); ieee80211_ifdetach(&sc->sc_ic); if_detach(ifp); + /*FALLTHROUGH*/ case FINISH_LED_ATTACH: rtw_led_detach(&sc->sc_led_state); /*FALLTHROUGH*/ diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index ae0a527887c..219246e443f 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.112 2018/09/03 16:29:31 riastradh Exp $ */ +/* $NetBSD: fd.c,v 1.113 2019/02/03 03:19:27 mrg Exp $ */ /*- * Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc. @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.112 2018/09/03 16:29:31 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.113 2019/02/03 03:19:27 mrg Exp $"); #include "opt_ddb.h" @@ -1235,6 +1235,7 @@ loop: case IOTIMEDOUT: isa_dmaabort(fdc->sc_ic, fdc->sc_drq); + /* FALLTHROUGH */ case SEEKTIMEDOUT: case RECALTIMEDOUT: case RESETTIMEDOUT: diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c index 10f3e652072..42afc84c2ab 100644 --- a/sys/dev/isa/gus.c +++ b/sys/dev/isa/gus.c @@ -1,4 +1,4 @@ -/* $NetBSD: gus.c,v 1.113 2018/06/23 06:57:24 maxv Exp $ */ +/* $NetBSD: gus.c,v 1.114 2019/02/03 03:19:27 mrg Exp $ */ /*- * Copyright (c) 1996, 1999, 2008 The NetBSD Foundation, Inc. @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.113 2018/06/23 06:57:24 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.114 2019/02/03 03:19:27 mrg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1558,6 +1558,7 @@ gus_dmaout_dointr(struct gus_softc *sc) (sc->sc_nbufs - 1) * sc->sc_chanblocksize - 2, guspeek(iot, ioh2, sc->sc_gusaddr + sc->sc_chanblocksize - 2)); + /* FALLTHROUGH */ case AUDIO_ENCODING_ALAW: case AUDIO_ENCODING_ULAW: byte: diff --git a/sys/dev/isa/if_ate.c b/sys/dev/isa/if_ate.c index 27dd3632033..b186c1cdddc 100644 --- a/sys/dev/isa/if_ate.c +++ b/sys/dev/isa/if_ate.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ate.c,v 1.50 2008/04/12 06:27:01 tsutsui Exp $ */ +/* $NetBSD: if_ate.c,v 1.51 2019/02/03 03:19:27 mrg Exp $ */ /* * All Rights Reserved, Copyright (C) Fujitsu Limited 1995 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.50 2008/04/12 06:27:01 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.51 2019/02/03 03:19:27 mrg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -290,6 +290,7 @@ ate_find(bus_space_tag_t iot, bus_space_handle_t ioh, int *iobase, int *irq) *irq = irqmap[1][n]; break; } + /* FALLTHROUGH */ default: *irq = irqmap[0][n]; break; diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c index 46cd22fea46..ef14498b3cc 100644 --- a/sys/dev/isa/sbdsp.c +++ b/sys/dev/isa/sbdsp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbdsp.c,v 1.138 2018/09/03 16:29:31 riastradh Exp $ */ +/* $NetBSD: sbdsp.c,v 1.139 2019/02/03 03:19:27 mrg Exp $ */ /*- * Copyright (c) 1999, 2008 The NetBSD Foundation, Inc. @@ -74,7 +74,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.138 2018/09/03 16:29:31 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.139 2019/02/03 03:19:27 mrg Exp $"); #include "midi.h" #include "mpu.h" @@ -639,7 +639,7 @@ sbdsp_set_params( hw.encoding = AUDIO_ENCODING_SLINEAR_LE; swcode = swap_bytes; } - /* fall into */ + /* FALLTHROUGH */ case AUDIO_ENCODING_SLINEAR: case AUDIO_ENCODING_SLINEAR_LE: bmode = SB_BMODE_SIGNED; @@ -650,7 +650,7 @@ sbdsp_set_params( hw.encoding = AUDIO_ENCODING_ULINEAR_LE; swcode = swap_bytes; } - /* fall into */ + /* FALLTHROUGH */ case AUDIO_ENCODING_ULINEAR_LE: bmode = SB_BMODE_UNSIGNED; break; @@ -1762,6 +1762,7 @@ sbdsp_mixer_set_port(void *addr, mixer_ctrl_t *cp) return 0; } } + /* FALLTHROUGH */ case SB_PCSPEAKER: case SB_INPUT_GAIN: case SB_OUTPUT_GAIN: @@ -1769,12 +1770,14 @@ sbdsp_mixer_set_port(void *addr, mixer_ctrl_t *cp) error = EINVAL; break; } + /* FALLTHROUGH */ case SB_MIC_VOL: case SB_LINE_IN_VOL: if (sc->sc_mixer_model == SBM_CT1335) { error = EINVAL; break; } + /* FALLTHROUGH */ case SB_VOICE_VOL: case SB_MIDI_VOL: case SB_CD_VOL: @@ -1805,7 +1808,7 @@ sbdsp_mixer_set_port(void *addr, mixer_ctrl_t *cp) error = EINVAL; break; } - /* fall into */ + /* FALLTHROUGH */ case SB_INPUT_GAIN: case SB_OUTPUT_GAIN: lgain = rgain = SB_ADJUST_2_GAIN(sc, @@ -1976,6 +1979,7 @@ sbdsp_mixer_get_port(void *addr, mixer_ctrl_t *cp) return 0; } } + /* FALLTHROUGH */ case SB_PCSPEAKER: case SB_INPUT_GAIN: case SB_OUTPUT_GAIN: @@ -1983,12 +1987,14 @@ sbdsp_mixer_get_port(void *addr, mixer_ctrl_t *cp) mutex_spin_exit(&sc->sc_intr_lock); return EINVAL; } + /* FALLTHROUGH */ case SB_MIC_VOL: case SB_LINE_IN_VOL: if (sc->sc_mixer_model == SBM_CT1335) { mutex_spin_exit(&sc->sc_intr_lock); return EINVAL; } + /* FALLTHROUGH */ case SB_VOICE_VOL: case SB_MIDI_VOL: case SB_CD_VOL: @@ -2000,7 +2006,7 @@ sbdsp_mixer_get_port(void *addr, mixer_ctrl_t *cp) mutex_spin_exit(&sc->sc_intr_lock); return EINVAL; } - /* fall into */ + /* FALLTHROUGH */ default: switch (cp->un.value.num_channels) { case 1: diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index 598a3c00dcc..6d68107b226 100644 --- a/sys/dev/pci/bktr/bktr_core.c +++ b/sys/dev/pci/bktr/bktr_core.c @@ -1,6 +1,6 @@ /* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */ -/* $NetBSD: bktr_core.c,v 1.55 2018/09/03 16:29:32 riastradh Exp $ */ +/* $NetBSD: bktr_core.c,v 1.56 2019/02/03 03:19:27 mrg Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */ /* @@ -98,7 +98,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.55 2018/09/03 16:29:32 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.56 2019/02/03 03:19:27 mrg Exp $"); #include "opt_bktr.h" /* Include any kernel config options */ @@ -2439,6 +2439,7 @@ common_ioctl(bktr_ptr_t bktr, ioctl_cmd_t cmd, void *arg) break; } + /* FALLTHROUGH */ default: return(EINVAL); } diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c index f75e26871b9..0ca035dd516 100644 --- a/sys/dev/pci/if_bce.c +++ b/sys/dev/pci/if_bce.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bce.c,v 1.50 2019/01/22 03:42:27 msaitoh Exp $ */ +/* $NetBSD: if_bce.c,v 1.51 2019/02/03 03:19:27 mrg Exp $ */ /* * Copyright (c) 2003 Clifford Wright. All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.50 2019/01/22 03:42:27 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.51 2019/02/03 03:19:27 mrg Exp $"); #include "vlan.h" @@ -297,6 +297,7 @@ bce_attach(device_t parent, device_t self, void *aux) if (pci_mapreg_map(pa, BCE_PCI_BAR0, memtype, 0, &sc->bce_btag, &sc->bce_bhandle, &memaddr, &memsize) == 0) break; + /* FALLTHROUGH */ default: aprint_error_dev(self, "unable to find mem space\n"); return; diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 358bb2faaf4..b2082abc5d2 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.322 2019/01/22 03:42:27 msaitoh Exp $ */ +/* $NetBSD: if_bge.c,v 1.323 2019/02/03 03:19:27 mrg Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.322 2019/01/22 03:42:27 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.323 2019/02/03 03:19:27 mrg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1631,11 +1631,14 @@ out: case 4: bus_dmamap_unload(sc->bge_dmatag, sc->bge_cdata.bge_rx_jumbo_map); + /* FALLTHROUGH */ case 3: bus_dmamap_destroy(sc->bge_dmatag, sc->bge_cdata.bge_rx_jumbo_map); + /* FALLTHROUGH */ case 2: bus_dmamem_unmap(sc->bge_dmatag, kva, BGE_JMEM); + /* FALLTHROUGH */ case 1: bus_dmamem_free(sc->bge_dmatag, &seg, rseg); break; @@ -3478,6 +3481,7 @@ bge_attach(device_t parent, device_t self, void *aux) } } #endif + /* FALLTHROUGH */ default: aprint_error_dev(sc->bge_dev, "can't find mem space\n"); return; diff --git a/sys/dev/pci/if_dge.c b/sys/dev/pci/if_dge.c index da9d621ebbe..d0f054360ea 100644 --- a/sys/dev/pci/if_dge.c +++ b/sys/dev/pci/if_dge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_dge.c,v 1.50 2018/12/09 11:14:02 jdolecek Exp $ */ +/* $NetBSD: if_dge.c,v 1.51 2019/02/03 03:19:27 mrg Exp $ */ /* * Copyright (c) 2004, SUNET, Swedish University Computer Network. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.50 2018/12/09 11:14:02 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.51 2019/02/03 03:19:27 mrg Exp $"); @@ -535,10 +535,13 @@ out: switch (state) { case 4: bus_dmamap_unload(sc->sc_dmat, sc->sc_bugmap); + /* FALLTHROUGH */ case 3: bus_dmamap_destroy(sc->sc_dmat, sc->sc_bugmap); + /* FALLTHROUGH */ case 2: bus_dmamem_unmap(sc->sc_dmat, kva, DGE_RXMEM); + /* FALLTHROUGH */ case 1: bus_dmamem_free(sc->sc_dmat, &seg, rseg); break; diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index ac83df340ba..405188a3bea 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ipw.c,v 1.71 2018/12/22 14:07:53 maxv Exp $ */ +/* $NetBSD: if_ipw.c,v 1.72 2019/02/03 03:19:27 mrg Exp $ */ /* FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp */ /*- @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.71 2018/12/22 14:07:53 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.72 2019/02/03 03:19:27 mrg Exp $"); /*- * Intel(R) PRO/Wireless 2100 MiniPCI driver @@ -1685,7 +1685,7 @@ ipw_ioctl(struct ifnet *ifp, u_long cmd, void *data) sc->sc_fwname = "ipw2100-1.2.fw"; ipw_free_firmware(sc); - /* FALLTRHOUGH */ + /* FALLTHROUGH */ default: error = ieee80211_ioctl(&sc->sc_ic, cmd, data); if (error != ENETRESET) diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index 3bf6e3783d8..48ca69a0bc9 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwi.c,v 1.110 2018/12/22 14:07:53 maxv Exp $ */ +/* $NetBSD: if_iwi.c,v 1.111 2019/02/03 03:19:27 mrg Exp $ */ /* $OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $ */ /*- @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.110 2018/12/22 14:07:53 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.111 2019/02/03 03:19:27 mrg Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -1942,8 +1942,8 @@ iwi_ioctl(struct ifnet *ifp, u_long cmd, void *data) error = iwi_cache_firmware(sc); if (error) break; - /* FALLTRHOUGH */ + /* FALLTHROUGH */ default: error = ieee80211_ioctl(&sc->sc_ic, cmd, data); diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 6e602209b5c..973b9a91f7b 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_msk.c,v 1.85 2019/01/27 02:08:42 pgoyette Exp $ */ +/* $NetBSD: if_msk.c,v 1.86 2019/02/03 03:19:27 mrg Exp $ */ /* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */ /* @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.85 2019/01/27 02:08:42 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.86 2019/02/03 03:19:27 mrg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -657,11 +657,14 @@ out: case 4: bus_dmamap_unload(sc->sc_dmatag, sc_if->sk_cdata.sk_rx_jumbo_map); + /* FALLTHROUGH */ case 3: bus_dmamap_destroy(sc->sc_dmatag, sc_if->sk_cdata.sk_rx_jumbo_map); + /* FALLTHROUGH */ case 2: bus_dmamem_unmap(sc->sc_dmatag, kva, MSK_JMEM); + /* FALLTHROUGH */ case 1: bus_dmamem_free(sc->sc_dmatag, &sc_if->sk_cdata.sk_jumbo_seg, diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 8c21797b1fc..fc7a786eac7 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sk.c,v 1.93 2019/01/22 03:42:27 msaitoh Exp $ */ +/* $NetBSD: if_sk.c,v 1.94 2019/02/03 03:19:27 mrg Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.93 2019/01/22 03:42:27 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.94 2019/02/03 03:19:27 mrg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -902,11 +902,14 @@ out: case 4: bus_dmamap_unload(sc->sc_dmatag, sc_if->sk_cdata.sk_rx_jumbo_map); + /* FALLTHROUGH */ case 3: bus_dmamap_destroy(sc->sc_dmatag, sc_if->sk_cdata.sk_rx_jumbo_map); + /* FALLTHROUGH */ case 2: bus_dmamem_unmap(sc->sc_dmatag, kva, SK_JMEM); + /* FALLTHROUGH */ case 1: bus_dmamem_free(sc->sc_dmatag, &seg, rseg); break; @@ -1608,6 +1611,7 @@ skc_attach(device_t parent, device_t self, void *aux) memtype, 0, &sc->sk_btag, &sc->sk_bhandle, &iobase, &iosize) == 0) break; + /* FALLTHROUGH */ default: aprint_error_dev(sc->sk_dev, "can't find mem space\n"); return; diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c index 2c6d11c1f87..b3457359fdb 100644 --- a/sys/dev/pci/mpii.c +++ b/sys/dev/pci/mpii.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpii.c,v 1.20 2019/01/27 02:08:42 pgoyette Exp $ */ +/* $NetBSD: mpii.c,v 1.21 2019/02/03 03:19:27 mrg Exp $ */ /* $OpenBSD: mpii.c,v 1.115 2018/08/14 05:22:21 jmatthew Exp $ */ /* * Copyright (c) 2010, 2012 Mike Belopuhov @@ -20,7 +20,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.20 2019/01/27 02:08:42 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.21 2019/02/03 03:19:27 mrg Exp $"); #include "bio.h" @@ -3264,6 +3264,7 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb) switch(sie->scsi_status) { case MPII_SCSIIO_STATUS_CHECK_COND: xs->error = XS_SENSE; + /* FALLTHROUGH */ case MPII_SCSIIO_STATUS_GOOD: xs->resid = xs->datalen - le32toh(sie->transfer_count); break; diff --git a/sys/dev/pci/pdcsata.c b/sys/dev/pci/pdcsata.c index fa1c589acef..f67d1e55302 100644 --- a/sys/dev/pci/pdcsata.c +++ b/sys/dev/pci/pdcsata.c @@ -1,4 +1,4 @@ -/* $NetBSD: pdcsata.c,v 1.30 2018/12/09 11:14:02 jdolecek Exp $ */ +/* $NetBSD: pdcsata.c,v 1.31 2019/02/03 03:19:27 mrg Exp $ */ /* * Copyright (c) 2004, Manuel Bouyer. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pdcsata.c,v 1.30 2018/12/09 11:14:02 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pdcsata.c,v 1.31 2019/02/03 03:19:27 mrg Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -355,6 +355,7 @@ pdcsata_chip_map(struct pciide_softc *sc, const struct pci_attach_args *pa) 2; sc->sc_wdcdev.sc_atac.atac_probe = wdc_drvprobe; + /* FALLTHROUGH */ default: aprint_error("unknown promise product 0x%x\n", sc->sc_pp->ide_product); diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c index 1ee476c42ed..5598334e2f2 100644 --- a/sys/dev/pcmcia/if_ray.c +++ b/sys/dev/pcmcia/if_ray.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ray.c,v 1.91 2019/01/08 08:47:21 msaitoh Exp $ */ +/* $NetBSD: if_ray.c,v 1.92 2019/02/03 03:19:27 mrg Exp $ */ /* * Copyright (c) 2000 Christian E. Hopps @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.91 2019/01/08 08:47:21 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.92 2019/02/03 03:19:27 mrg Exp $"); #include "opt_inet.h" @@ -895,6 +895,7 @@ ray_ioctl(struct ifnet *ifp, u_long cmd, void *data) break; case SIOCADDMULTI: RAY_DPRINTF(("%s: ioctl: cmd SIOCADDMULTI\n", ifp->if_xname)); + /* FALLTHROUGH */ case SIOCDELMULTI: if (cmd == SIOCDELMULTI) RAY_DPRINTF(("%s: ioctl: cmd SIOCDELMULTI\n", @@ -907,6 +908,7 @@ ray_ioctl(struct ifnet *ifp, u_long cmd, void *data) break; case SIOCSIFMEDIA: RAY_DPRINTF(("%s: ioctl: cmd SIOCSIFMEDIA\n", ifp->if_xname)); + /* FALLTHROUGH */ case SIOCGIFMEDIA: if (cmd == SIOCGIFMEDIA) RAY_DPRINTF(("%s: ioctl: cmd SIOCGIFMEDIA\n", diff --git a/sys/dev/pcmcia/pcmcia_cis.c b/sys/dev/pcmcia/pcmcia_cis.c index 03b1254d33e..c1b6bfec1a3 100644 --- a/sys/dev/pcmcia/pcmcia_cis.c +++ b/sys/dev/pcmcia/pcmcia_cis.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcmcia_cis.c,v 1.55 2009/05/12 14:42:19 cegger Exp $ */ +/* $NetBSD: pcmcia_cis.c,v 1.56 2019/02/03 03:19:27 mrg Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.55 2009/05/12 14:42:19 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.56 2019/02/03 03:19:27 mrg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -408,6 +408,7 @@ pcmcia_scan_cis(device_t dev, * function. This tuple has structural and * semantic content. */ + /* FALLTHROUGH */ default: { if ((*fct) (&tuple, arg)) { diff --git a/sys/dev/scsipi/atapi_base.c b/sys/dev/scsipi/atapi_base.c index 74b0226503e..043afe4a5de 100644 --- a/sys/dev/scsipi/atapi_base.c +++ b/sys/dev/scsipi/atapi_base.c @@ -1,4 +1,4 @@ -/* $NetBSD: atapi_base.c,v 1.29 2014/10/18 08:33:28 snj Exp $ */ +/* $NetBSD: atapi_base.c,v 1.30 2019/02/03 03:19:28 mrg Exp $ */ /*- * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: atapi_base.c,v 1.29 2014/10/18 08:33:28 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atapi_base.c,v 1.30 2019/02/03 03:19:28 mrg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -84,6 +84,7 @@ atapi_interpret_sense(struct scsipi_xfer *xs) switch (key) { case SKEY_RECOVERED_ERROR: msg = "soft error (corrected)"; + /* FALLTHROUGH */ case SKEY_NO_SENSE: if (xs->resid == xs->datalen) xs->resid = 0; /* not short read */ diff --git a/sys/dev/scsipi/st.c b/sys/dev/scsipi/st.c index da70b65335e..4a915220c59 100644 --- a/sys/dev/scsipi/st.c +++ b/sys/dev/scsipi/st.c @@ -1,4 +1,4 @@ -/* $NetBSD: st.c,v 1.234 2018/03/24 08:08:19 mlelstv Exp $ */ +/* $NetBSD: st.c,v 1.235 2019/02/03 03:19:28 mrg Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.234 2018/03/24 08:08:19 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.235 2019/02/03 03:19:28 mrg Exp $"); #ifdef _KERNEL_OPT #include "opt_scsi.h" @@ -1459,6 +1459,7 @@ stioctl(dev_t dev, u_long cmd, void *arg, int flag, struct lwp *l) break; case MTBSF: /* backward space file */ number = -number; + /* FALLTHROUGH */ case MTFSF: /* forward space file */ error = st_check_eod(st, FALSE, &nmarks, flags); if (!error) @@ -1467,6 +1468,7 @@ stioctl(dev_t dev, u_long cmd, void *arg, int flag, struct lwp *l) break; case MTBSR: /* backward space record */ number = -number; + /* FALLTHROUGH */ case MTFSR: /* forward space record */ error = st_check_eod(st, true, &nmarks, flags); if (!error) diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 117f5137850..ee2d087c900 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $NetBSD: umass.c,v 1.167 2019/01/22 06:40:49 skrll Exp $ */ +/* $NetBSD: umass.c,v 1.168 2019/02/03 03:19:28 mrg Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -124,7 +124,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.167 2019/01/22 06:40:49 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.168 2019/02/03 03:19:28 mrg Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1249,7 +1249,8 @@ umass_bbb_state(struct usbd_xfer *xfer, void *priv, (uintptr_t)sc, 0, 0, 0); } - /* FALLTHROUGH if no data phase, err == 0 */ + /* if no data phase, err == 0 */ + /* FALLTHROUGH */ case TSTATE_BBB_DATA: /* Command transport phase error handling (ignored if no data * phase (fallthrough from previous state)) */ @@ -1282,7 +1283,8 @@ umass_bbb_state(struct usbd_xfer *xfer, void *priv, } } - /* FALLTHROUGH, err == 0 (no data phase or successful) */ + /* err == 0 (no data phase or successful) */ + /* FALLTHROUGH */ case TSTATE_BBB_DCLEAR: /* stall clear after data phase */ if (sc->transfer_dir == DIR_IN) memcpy(sc->transfer_data, sc->datain_buffer, @@ -1292,7 +1294,8 @@ umass_bbb_state(struct usbd_xfer *xfer, void *priv, umass_dump_buffer(sc, sc->transfer_data, sc->transfer_datalen, 48)); - /* FALLTHROUGH, err == 0 (no data phase or successful) */ + /* err == 0 (no data phase or successful) */ + /* FALLTHROUGH */ case TSTATE_BBB_SCLEAR: /* stall clear after status phase */ /* Reading of CSW after bulk stall condition in data phase * (TSTATE_BBB_DATA2) or bulk-in stall condition after @@ -1719,7 +1722,8 @@ umass_cbi_state(struct usbd_xfer *xfer, void *priv, (uintptr_t)sc, 0, 0, 0); } - /* FALLTHROUGH if no data phase, err == 0 */ + /* if no data phase, err == 0 */ + /* FALLTHROUGH */ case TSTATE_CBI_DATA: /* Command transport phase error handling (ignored if no data * phase (fallthrough from previous state)) */ diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 9195baffa92..f36a50f8cae 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $NetBSD: usb.c,v 1.176 2019/01/29 09:28:50 pgoyette Exp $ */ +/* $NetBSD: usb.c,v 1.177 2019/02/03 03:19:28 mrg Exp $ */ /* * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.176 2019/01/29 09:28:50 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.177 2019/02/03 03:19:28 mrg Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -671,7 +671,7 @@ usbread(dev_t dev, struct uio *uio, int flag) case sizeof(struct usb_event_old): ueo = kmem_zalloc(sizeof(struct usb_event_old), KM_SLEEP); useold = 1; - /* FALLTHRU */ + /* FALLTHROUGH */ case sizeof(struct usb_event): ue = usb_alloc_event(); break; @@ -884,6 +884,7 @@ usbioctl(dev_t devt, u_long cmd, void *data, int flag, struct lwp *l) error = EINVAL; if (error) goto fail; + break; } case USB_DEVICESTATS: diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index fbf64deab5b..37e905e8f4f 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsdisplay.c,v 1.152 2019/01/30 11:24:48 jmcneill Exp $ */ +/* $NetBSD: wsdisplay.c,v 1.153 2019/02/03 03:19:28 mrg Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.152 2019/01/30 11:24:48 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.153 2019/02/03 03:19:28 mrg Exp $"); #ifdef _KERNEL_OPT #include "opt_wsdisplay_compat.h" @@ -1565,7 +1565,7 @@ wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, void *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: |
