diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index eb4990189619..f8a346e940c0 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic79xx.c,v 1.50 2014/10/18 08:33:27 snj Exp $	*/
+/*	$NetBSD: aic79xx.c,v 1.51 2019/02/04 10:09:31 mrg Exp $	*/
 
 /*
  * Core routines and tables shareable across OS platforms.
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic79xx.c,v 1.50 2014/10/18 08:33:27 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx.c,v 1.51 2019/02/04 10:09:31 mrg Exp $");
 
 #include <dev/ic/aic79xx_osm.h>
 #include <dev/ic/aic79xx_inline.h>
@@ -1401,6 +1401,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
 			switch (scb->hscb->task_management) {
 			case SIU_TASKMGMT_ABORT_TASK:
 				tag = SCB_GET_TAG(scb);
+				/* FALLTHROUGH */
 			case SIU_TASKMGMT_ABORT_TASK_SET:
 			case SIU_TASKMGMT_CLEAR_TASK_SET:
 				lun = scb->hscb->lun;
@@ -1411,6 +1412,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
 				break;
 			case SIU_TASKMGMT_LUN_RESET:
 				lun = scb->hscb->lun;
+				/* FALLTHROUGH */
 			case SIU_TASKMGMT_TARGET_RESET:
 			{
 				struct ahd_devinfo devinfo;
@@ -5515,8 +5517,8 @@ ahd_fini_scbdata(struct ahd_softc *ahd)
 				       &sns_map->dmasegs, sns_map->nseg);
 			free(sns_map, M_DEVBUF);
 		}
-		/* FALLTHROUGH */
 	}
+	/* FALLTHROUGH */
 	case 2:
 	{
 		struct map_node *sg_map;
@@ -5529,8 +5531,8 @@ ahd_fini_scbdata(struct ahd_softc *ahd)
 				       &sg_map->dmasegs, sg_map->nseg);
 			free(sg_map, M_DEVBUF);
 		}
-		/* FALLTHROUGH */
 	}
+	/* FALLTHROUGH */
 	case 1:
 	{
 		struct map_node *hscb_map;
@@ -5543,8 +5545,8 @@ ahd_fini_scbdata(struct ahd_softc *ahd)
 				       &hscb_map->dmasegs, hscb_map->nseg);
 			free(hscb_map, M_DEVBUF);
 		}
-		/* FALLTHROUGH */
 	}
+	/* FALLTHROUGH */
 	case 0:
 		break;
 	}
@@ -6175,6 +6177,7 @@ ahd_init(struct ahd_softc *ahd)
 		case FLX_CSTAT_OVER:
 		case FLX_CSTAT_UNDER:
 			warn_user++;
+			/* FALLTHROUGH */
 		case FLX_CSTAT_INVALID:
 		case FLX_CSTAT_OKAY:
 			if (warn_user == 0 && bootverbose == 0)
@@ -7341,8 +7344,8 @@ ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
 			if ((scb->flags & SCB_ACTIVE) == 0)
 				printf("Inactive SCB in Waiting List\n");
 			ahd_done(ahd, scb);
-			/* FALLTHROUGH */
 		}
+		/* FALLTHROUGH */
 		case SEARCH_REMOVE:
 			ahd_rem_wscb(ahd, scbid, prev, next, tid);
 			if (prev == SCB_LIST_NULL)
@@ -7350,6 +7353,7 @@ ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
 			break;
 		case SEARCH_PRINT:
 			printf("0x%x ", scbid);
+			/* FALLTHROUGH */
 		case SEARCH_COUNT:
 			prev = scbid;
 			break;
@@ -8505,8 +8509,8 @@ ahd_download_instr(struct ahd_softc *ahd, u_int instrptr, uint8_t *dconsts)
 	{
 		fmt3_ins = &instr.format3;
 		fmt3_ins->address = ahd_resolve_seqaddr(ahd, fmt3_ins->address);
-		/* FALLTHROUGH */
 	}
+	/* FALLTHROUGH */
 	case AIC_OP_OR:
 	case AIC_OP_AND:
 	case AIC_OP_XOR:
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 00585fa51f28..180d934004e2 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic7xxx.c,v 1.134 2018/04/02 10:44:06 rin Exp $	*/
+/*	$NetBSD: aic7xxx.c,v 1.135 2019/02/04 10:09:31 mrg Exp $	*/
 
 /*
  * Core routines and tables shareable across OS platforms.
@@ -39,7 +39,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aic7xxx.c,v 1.134 2018/04/02 10:44:06 rin Exp $
+ * $Id: aic7xxx.c,v 1.135 2019/02/04 10:09:31 mrg Exp $
  *
  * //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
  *
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.134 2018/04/02 10:44:06 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.135 2019/02/04 10:09:31 mrg Exp $");
 
 #include <dev/ic/aic7xxx_osm.h>
 #include <dev/ic/aic7xxx_inline.h>
@@ -5475,8 +5475,8 @@ ahc_search_qinfifo(struct ahc_softc *ahc, int target, char channel,
 					printf("Inactive SCB in "
 					       "Waiting List\n");
 				ahc_done(ahc, scb);
-				/* FALLTHROUGH */
 			}
+			/* FALLTHROUGH */
 			case SEARCH_REMOVE:
 				next = ahc_rem_wscb(ahc, next, prev);
 				break;
@@ -6470,8 +6470,8 @@ ahc_download_instr(struct ahc_softc *ahc, u_int instrptr, uint8_t *dconsts)
 		}
 		address -= address_offset;
 		fmt3_ins->address = address;
-		/* FALLTHROUGH */
 	}
+	/* FALLTHROUGH */
 	case AIC_OP_OR:
 	case AIC_OP_AND:
 	case AIC_OP_XOR:
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index af7fd2ba5b80..43603dd5c9cd 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_usrreq.c,v 1.189 2019/01/29 09:28:50 pgoyette Exp $	*/
+/*	$NetBSD: uipc_usrreq.c,v 1.190 2019/02/04 10:11:34 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.189 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.190 2019/02/04 10:11:34 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -669,9 +669,8 @@ uipc_ctloutput(int op, struct socket *so, struct sockopt *sopt)
 				error = sockopt_setint(sopt, optval);
 				break;
 			}
-			/* FALLTHROUGH */
 #undef OPTBIT
-
+			/* FALLTHROUGH */
 		default:
 			error = ENOPROTOOPT;
 			break;
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index cc2b65ef2792..4180b6f6747c 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ethersubr.c,v 1.272 2018/12/21 08:58:08 msaitoh Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.273 2019/02/04 10:11:34 mrg Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.272 2018/12/21 08:58:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.273 2019/02/04 10:11:34 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -790,9 +790,8 @@ ether_input(struct ifnet *ifp, struct mbuf *m)
 			/* unknown subtype */
 			break;
 		}
-		/* FALLTHROUGH */
 	}
-
+	/* FALLTHROUGH */
 	default:
 		if (m->m_flags & M_PROMISC) {
 			m_freem(m);