2 files changed, 7 insertions, 10 deletions

diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index db7c6ed725ff..e9d21b1fee40 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -273,9 +273,9 @@ feeder_fmtchain(u_int32_t *to, struct pcm_feeder *source, struct pcm_feeder *sto
 
 	SLIST_FOREACH(fte, &feedertab, link) {
 		if (fte->desc == NULL)
-			goto no;
+			continue;
 		if (fte->desc->type != FEEDER_FMT)
-			goto no;
+			continue;
 		if (fte->desc->in == source->desc->out) {
 			try = feeder_create(fte->feederclass, fte->desc);
 			if (try) {
@@ -286,7 +286,6 @@ feeder_fmtchain(u_int32_t *to, struct pcm_feeder *source, struct pcm_feeder *sto
 				feeder_destroy(try);
 			}
 		}
-no:
 	}
 	/* printf("giving up %s...\n", source->class->name); */
 
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index 6a982df640bf..85efa2634fd7 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -280,10 +280,9 @@ pcm_setmaxautovchans(struct snddev_info *d, int num)
 					err = vchan_destroy(c);
 					if (err)
 						device_printf(d->dev, "vchan_destroy(%s) == %d\n", c->name, err);
-					goto restart;
+					break;		/* restart */
 				}
 			}
-restart:
 		}
 	}
 }
@@ -782,9 +781,9 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose)
 			}
 			sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC)? "userland" : "hardware");
 		}
-skipverbose:
 	} else
 		sbuf_printf(s, " (mixer only)");
+skipverbose:
 	snd_mtxunlock(d->lock);
 
 	return 0;
@@ -826,13 +825,13 @@ sysctl_hw_snd_vchans(SYSCTL_HANDLER_ARGS)
 				c = sce->channel;
 				/* not a candidate if not a play channel */
 				if (c->direction != PCMDIR_PLAY)
-					goto addskip;
+					continue;
 				/* not a candidate if a virtual channel */
 				if (c->flags & CHN_F_VIRTUAL)
-					goto addskip;
+					continue;
 				/* not a candidate if it's in use */
 				if ((c->flags & CHN_F_BUSY) && (SLIST_EMPTY(&c->children)))
-					goto addskip;
+					continue;
 				/*
 				 * if we get here we're a nonvirtual play channel, and either
 				 * 1) not busy
@@ -841,7 +840,6 @@ sysctl_hw_snd_vchans(SYSCTL_HANDLER_ARGS)
 				 * thus we can add children
 				 */
 				goto addok;
-addskip:
 			}
 			pcm_unlock(d);
 			return EBUSY;