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/isa | |
| 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/isa')
| -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 |
4 files changed, 21 insertions, 12 deletions
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: |
