diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -363,7 +363,7 @@ PCM_RELEASE(d); PCM_UNLOCK(d); - PCM_GIANT_LEAVE(d); + PCM_GIANT_EXIT(d); skip: free(priv, M_DEVBUF); priv = NULL; @@ -528,7 +528,7 @@ PCM_RELEASE(d); PCM_UNLOCK(d); - PCM_GIANT_LEAVE(d); + PCM_GIANT_EXIT(d); return (0); } @@ -602,7 +602,7 @@ relchns(priv, prio); - PCM_GIANT_LEAVE(d); + PCM_GIANT_EXIT(d); return (ret); } @@ -1933,7 +1933,7 @@ break; } - PCM_GIANT_LEAVE(d); + PCM_GIANT_EXIT(d); return (ret); } @@ -1976,7 +1976,7 @@ relchns(priv, SD_F_PRIO_RD | SD_F_PRIO_WR); - PCM_GIANT_LEAVE(d); + PCM_GIANT_EXIT(d); return (ret); } @@ -2060,7 +2060,7 @@ *object = vm_pager_allocate(OBJT_DEVICE, i_dev, size, nprot, *offset, curthread->td_ucred); - PCM_GIANT_LEAVE(d); + PCM_GIANT_EXIT(d); if (*object == NULL) return (EINVAL); diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1245,7 +1245,7 @@ MIXER_CMD_CDEV); PCM_RELEASE_QUICK(d); - PCM_GIANT_LEAVE(d); + PCM_GIANT_EXIT(d); return (ret); } 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 @@ -576,10 +576,6 @@ } while (0) #endif /* SND_DIAGNOSTIC */ -#define PCM_GIANT_LEAVE(x) \ - PCM_GIANT_EXIT(x); \ -} while (0) - #endif /* _KERNEL */ #endif /* _OS_H_ */