diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -320,7 +320,6 @@ pid_t pid, char *comm, int devunit); int pcm_chnrelease(struct pcm_channel *c); int pcm_chnref(struct pcm_channel *c, int ref); -int pcm_inprog(struct snddev_info *d, int delta); struct pcm_channel *pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, int num, void *devinfo); int pcm_chn_destroy(struct pcm_channel *ch); @@ -379,7 +378,6 @@ struct snd_clone *clones; unsigned devcount, playcount, reccount, pvchancount, rvchancount ; unsigned flags; - int inprog; unsigned int bufsz; void *devinfo; device_t dev; diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -392,16 +392,6 @@ return (c->refcount); } -int -pcm_inprog(struct snddev_info *d, int delta) -{ - PCM_LOCKASSERT(d); - - d->inprog += delta; - - return (d->inprog); -} - static void pcm_setmaxautovchans(struct snddev_info *d, int num) { @@ -1127,7 +1117,6 @@ d->pvchanformat = 0; d->rvchanrate = 0; d->rvchanformat = 0; - d->inprog = 0; /* * Create clone manager, disabled by default. Cloning will be @@ -1182,12 +1171,6 @@ d->flags |= SD_F_DETACHING; - if (d->inprog != 0) { - device_printf(dev, "unregister: operation in progress\n"); - PCM_UNLOCK(d); - return (EBUSY); - } - PCM_ACQUIRE(d); PCM_UNLOCK(d);