From nobody Tue Sep 22 17:34:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hq6fb3sKJz6snjL for ; Tue, 22 Sep 2026 17:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hq6fb3bmMz3MVZ for ; Tue, 22 Sep 2026 17:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790098471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ls26xY7duaAMxmsQIAHFJQ6wBdzRmsV+nPzwMDMIyfc=; b=H79qDP+F9GWYjqf34+XerAINLCxOwzZTaZ+1JvdB4ka8CFqm/QtIlJAw42/OVM8QiCarD9 r37lNUCU7uFOCBuSeHB++SG+/Qw93LWYIVeusmHPcuy5vviEdcZs6q23tHAhlFv7yq9uxQ UsHdwZ4pzs35gxva+Tt1jNtofif+qPKdQwSFaTWoQLArcwlesAA8415Va65Qxcsq9MaVc+ GWMVOTWBbwTz5SS8U0XKWG/GWT8uHQp1Wqxu+MdkMrsjBGv83DMnGkBQCnfoz6JJsSd5/k uChobsggoBuUjSW7PbZQNR69Tai5pDb2eSPnMkHpJVVMUTfRvkOAPdoBH+Lh/Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790098471; b=KA9QmZd1WMvF7h9w6z7SJKt+zQBzOXZzW4+PL8WPARKoZXgG0G2GWZMdXyCmCR5+iTev+B xmhdSuYrFn75zu2p5BmXoL36mrcJcepMaClEiAX20/JSq1rZXArHWVBFubBa6SSWJ5tHPL 4Y7XxF+AMksa7IWIn1qudQzOD9SncW8i1pcGOGnB+wh48AeBNxAsqACNvUcSMN1/x0qmjd BxRGpGGsadIE7Xf1CLuAFJxYZajsk+rLfyRF+HDqjizrJcpS0Y6rSg7NSkCyZLac51zJvt 1Gv86kdqXIv+v+Y1U/iRVLUyIckZ4cDGTxbwCLMj+lBs0s1NF16Gc6eSv2YXtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790098471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ls26xY7duaAMxmsQIAHFJQ6wBdzRmsV+nPzwMDMIyfc=; b=aMPu7zj5IoDUsFq2YcQYLLHlzEORUb1Esi+OxqXgqIt8uxzL8bQuUy+YdSspJiq1TZvbtD 3uAxqr0ux2OPkrnTC9EEJcTbIx9Ypzv8b9qXpHXv6Yd8K3XtkeD9748IlKKHfj5xsLFPRU sroe+A3Xu9Prm1YqWOFz4fWtMEs4IpS8mLghdgi3tB7mNNI9pUP8iPzdQP8OHqZ2F6PGi4 qnhBG/2gsTDqn6r59PMJ8KYPfrgZvYPuAzLZ867s8Bqk+hSNjRg+65rQrya1Bix7Xp3ntd JEnryr0JrRcaXRJdpUkUIh2mCZsQTIO6SDZpr7i/Knt8tZir7swafVVj6f4Gfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hq6fb280zzGtg for ; Tue, 22 Sep 2026 17:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 412bd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 22 Sep 2026 17:34:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 32137c41065c - main - sound: Retire the version constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32137c41065c3fa101bf0056b76889b98a7492cb Auto-Submitted: auto-generated Date: Tue, 22 Sep 2026 17:34:26 +0000 Message-Id: <6ab2bc22.412bd.10bb456f@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=32137c41065c3fa101bf0056b76889b98a7492cb commit 32137c41065c3fa101bf0056b76889b98a7492cb Author: Christos Margiolis AuthorDate: 2026-09-22 17:34:16 +0000 Commit: Christos Margiolis CommitDate: 2026-09-22 17:34:16 +0000 sound: Retire the version constants They exist only to fill in MODULE_DEPEND() and MODULE_VERSION(), and every consumer passed the same value for all three, so the version range never did anything. Use 1, like the rest of the tree does. MFC after: 1 week Sponsored by: The FreeBSD Foundation Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D59873 --- sys/arm/allwinner/a10_codec.c | 2 +- sys/arm/broadcom/bcm2835/bcm2835_audio.c | 2 +- sys/arm/freescale/imx/imx6_ssi.c | 2 +- sys/arm/freescale/vybrid/vf_sai.c | 2 +- sys/dev/firewire/fwisound.c | 2 +- sys/dev/firewire/fwisound_pcm.c | 2 +- sys/dev/sound/dummy.c | 2 +- sys/dev/sound/macio/davbus.c | 2 +- sys/dev/sound/macio/i2s.c | 2 +- sys/dev/sound/pci/als4000.c | 2 +- sys/dev/sound/pci/atiixp.c | 2 +- sys/dev/sound/pci/cmi.c | 2 +- sys/dev/sound/pci/cs4281.c | 2 +- sys/dev/sound/pci/csa.c | 2 +- sys/dev/sound/pci/csamidi.c | 2 +- sys/dev/sound/pci/csapcm.c | 2 +- sys/dev/sound/pci/emu10k1.c | 2 +- sys/dev/sound/pci/emu10kx-midi.c | 2 +- sys/dev/sound/pci/emu10kx-pcm.c | 2 +- sys/dev/sound/pci/envy24.c | 2 +- sys/dev/sound/pci/envy24ht.c | 2 +- sys/dev/sound/pci/es137x.c | 2 +- sys/dev/sound/pci/fm801.c | 2 +- sys/dev/sound/pci/hda/hdaa.c | 2 +- sys/dev/sound/pci/hdsp-pcm.c | 2 +- sys/dev/sound/pci/hdspe-pcm.c | 2 +- sys/dev/sound/pci/ich.c | 2 +- sys/dev/sound/pci/maestro3.c | 2 +- sys/dev/sound/pci/neomagic.c | 2 +- sys/dev/sound/pci/solo.c | 2 +- sys/dev/sound/pci/spicds.c | 2 +- sys/dev/sound/pci/t4dwave.c | 2 +- sys/dev/sound/pci/via8233.c | 2 +- sys/dev/sound/pci/via82c686.c | 2 +- sys/dev/sound/pci/vibes.c | 2 +- sys/dev/sound/pcm/sound.c | 2 +- sys/dev/sound/pcm/sound.h | 6 ------ sys/dev/sound/usb/uaudio.c | 2 +- sys/dev/sound/usb/uaudio_pcm.c | 2 +- 39 files changed, 38 insertions(+), 44 deletions(-) diff --git a/sys/arm/allwinner/a10_codec.c b/sys/arm/allwinner/a10_codec.c index 01f514af2e9a..6787fbf2ca5f 100644 --- a/sys/arm/allwinner/a10_codec.c +++ b/sys/arm/allwinner/a10_codec.c @@ -1201,5 +1201,5 @@ static driver_t a10codec_pcm_driver = { }; DRIVER_MODULE(a10codec, simplebus, a10codec_pcm_driver, 0, 0); -MODULE_DEPEND(a10codec, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(a10codec, sound, 1, 1, 1); MODULE_VERSION(a10codec, 1); diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index da6a00c3e3a1..3718bf0e786e 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -1137,6 +1137,6 @@ static driver_t bcm2835_audio_driver = { }; DRIVER_MODULE(bcm2835_audio, vchiq, bcm2835_audio_driver, 0, 0); -MODULE_DEPEND(bcm2835_audio, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(bcm2835_audio, sound, 1, 1, 1); MODULE_DEPEND(bcm2835_audio, vchiq, 1, 1, 1); MODULE_VERSION(bcm2835_audio, 1); diff --git a/sys/arm/freescale/imx/imx6_ssi.c b/sys/arm/freescale/imx/imx6_ssi.c index 738c2cc09a55..cc6a208f8e8a 100644 --- a/sys/arm/freescale/imx/imx6_ssi.c +++ b/sys/arm/freescale/imx/imx6_ssi.c @@ -847,6 +847,6 @@ static driver_t ssi_pcm_driver = { }; DRIVER_MODULE(ssi, simplebus, ssi_pcm_driver, 0, 0); -MODULE_DEPEND(ssi, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(ssi, sound, 1, 1, 1); MODULE_DEPEND(ssi, sdma, 0, 0, 0); MODULE_VERSION(ssi, 1); diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index 17a3d4fc799b..82216ae1731b 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -792,5 +792,5 @@ static driver_t sai_pcm_driver = { }; DRIVER_MODULE(sai, simplebus, sai_pcm_driver, 0, 0); -MODULE_DEPEND(sai, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(sai, sound, 1, 1, 1); MODULE_VERSION(sai, 1); diff --git a/sys/dev/firewire/fwisound.c b/sys/dev/firewire/fwisound.c index da04ae9f034b..051773493e34 100644 --- a/sys/dev/firewire/fwisound.c +++ b/sys/dev/firewire/fwisound.c @@ -545,4 +545,4 @@ static driver_t fwisound_driver = { DRIVER_MODULE(fwisound, firewire, fwisound_driver, 0, 0); MODULE_VERSION(fwisound, 1); MODULE_DEPEND(fwisound, firewire, 1, 1, 1); -MODULE_DEPEND(fwisound, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(fwisound, sound, 1, 1, 1); diff --git a/sys/dev/firewire/fwisound_pcm.c b/sys/dev/firewire/fwisound_pcm.c index a7dd6f1c1a01..d9ebff56a283 100644 --- a/sys/dev/firewire/fwisound_pcm.c +++ b/sys/dev/firewire/fwisound_pcm.c @@ -230,4 +230,4 @@ static driver_t fwisound_pcm_driver = { DRIVER_MODULE(fwisound_pcm, fwisound, fwisound_pcm_driver, 0, 0); MODULE_DEPEND(fwisound_pcm, fwisound, 1, 1, 1); -MODULE_DEPEND(fwisound_pcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(fwisound_pcm, sound, 1, 1, 1); diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 7b456884040e..afe3c0a59fe0 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -434,5 +434,5 @@ static driver_t dummy_driver = { }; DRIVER_MODULE(snd_dummy, nexus, dummy_driver, 0, 0); -MODULE_DEPEND(snd_dummy, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_dummy, sound, 1, 1, 1); MODULE_VERSION(snd_dummy, 1); diff --git a/sys/dev/sound/macio/davbus.c b/sys/dev/sound/macio/davbus.c index 10cf85cf98e0..6ceab21b322c 100644 --- a/sys/dev/sound/macio/davbus.c +++ b/sys/dev/sound/macio/davbus.c @@ -86,7 +86,7 @@ static driver_t pcm_davbus_driver = { }; DRIVER_MODULE(pcm_davbus, macio, pcm_davbus_driver, 0, 0); -MODULE_DEPEND(pcm_davbus, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(pcm_davbus, sound, 1, 1, 1); /***************************************************************************** Probe and attachment routines. diff --git a/sys/dev/sound/macio/i2s.c b/sys/dev/sound/macio/i2s.c index 711484fd0132..3dabbc93c77c 100644 --- a/sys/dev/sound/macio/i2s.c +++ b/sys/dev/sound/macio/i2s.c @@ -119,7 +119,7 @@ static driver_t pcm_i2s_driver = { }; DRIVER_MODULE(pcm_i2s, macio, pcm_i2s_driver, 0, 0); -MODULE_DEPEND(pcm_i2s, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(pcm_i2s, sound, 1, 1, 1); static int aoagpio_probe(device_t); static int aoagpio_attach(device_t); diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index b5aefa333d86..92f8c526adfa 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -935,5 +935,5 @@ static driver_t als_driver = { }; DRIVER_MODULE(snd_als4000, pci, als_driver, 0, 0); -MODULE_DEPEND(snd_als4000, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_als4000, sound, 1, 1, 1); MODULE_VERSION(snd_als4000, 1); diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 631205b273ab..f891c9d04580 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -1412,5 +1412,5 @@ static driver_t atiixp_driver = { }; DRIVER_MODULE(snd_atiixp, pci, atiixp_driver, 0, 0); -MODULE_DEPEND(snd_atiixp, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_atiixp, sound, 1, 1, 1); MODULE_VERSION(snd_atiixp, 1); diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index e53b46467f0b..8de22ea83d9c 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -1105,6 +1105,6 @@ static driver_t cmi_driver = { }; DRIVER_MODULE(snd_cmi, pci, cmi_driver, 0, 0); -MODULE_DEPEND(snd_cmi, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_cmi, sound, 1, 1, 1); MODULE_DEPEND(snd_cmi, midi, 1,1,1); MODULE_VERSION(snd_cmi, 1); diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index a30467566b36..da95d700407d 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -964,5 +964,5 @@ static driver_t cs4281_driver = { }; DRIVER_MODULE(snd_cs4281, pci, cs4281_driver, 0, 0); -MODULE_DEPEND(snd_cs4281, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_cs4281, sound, 1, 1, 1); MODULE_VERSION(snd_cs4281, 1); diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index ef3b0a9d2427..f88cfa891b08 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -1034,5 +1034,5 @@ static driver_t csa_driver = { * csa can be attached to a pci bus. */ DRIVER_MODULE(snd_csa, pci, csa_driver, 0, 0); -MODULE_DEPEND(snd_csa, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_csa, sound, 1, 1, 1); MODULE_VERSION(snd_csa, 1); diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c index 485aa0c4a880..1559c38114af 100644 --- a/sys/dev/sound/pci/csamidi.c +++ b/sys/dev/sound/pci/csamidi.c @@ -277,5 +277,5 @@ static driver_t midicsa_driver = { }; DRIVER_MODULE(snd_csa_midi, csa, midicsa_driver, 0, 0); MODULE_DEPEND(snd_csa_midi, snd_csa, 1, 1, 1); -MODULE_DEPEND(snd_csa_midi, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_csa_midi, sound, 1, 1, 1); MODULE_VERSION(snd_csa_midi, 1); diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index a40c4a083787..3131f401fba3 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -1031,6 +1031,6 @@ static driver_t pcmcsa_driver = { }; DRIVER_MODULE(snd_csapcm, csa, pcmcsa_driver, 0, 0); -MODULE_DEPEND(snd_csapcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_csapcm, sound, 1, 1, 1); MODULE_DEPEND(snd_csapcm, snd_csa, 1, 1, 1); MODULE_VERSION(snd_csapcm, 1); diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index 5120ec2411a1..b9a0b5356bde 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -2194,7 +2194,7 @@ static driver_t emu_driver = { }; DRIVER_MODULE(snd_emu10k1, pci, emu_driver, NULL, NULL); -MODULE_DEPEND(snd_emu10k1, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_emu10k1, sound, 1, 1, 1); MODULE_VERSION(snd_emu10k1, 1); MODULE_DEPEND(snd_emu10k1, midi, 1, 1, 1); diff --git a/sys/dev/sound/pci/emu10kx-midi.c b/sys/dev/sound/pci/emu10kx-midi.c index 0fed9bf3b530..058a960357f8 100644 --- a/sys/dev/sound/pci/emu10kx-midi.c +++ b/sys/dev/sound/pci/emu10kx-midi.c @@ -240,5 +240,5 @@ static driver_t emu_midi_driver = { }; DRIVER_MODULE(snd_emu10kx_midi, emu10kx, emu_midi_driver, 0, 0); MODULE_DEPEND(snd_emu10kx_midi, snd_emu10kx, SND_EMU10KX_MINVER, SND_EMU10KX_PREFVER, SND_EMU10KX_MAXVER); -MODULE_DEPEND(snd_emu10kx_midi, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_emu10kx_midi, sound, 1, 1, 1); MODULE_VERSION(snd_emu10kx_midi, SND_EMU10KX_PREFVER); diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c index 55b1b4d8cc1c..9e8114e8318c 100644 --- a/sys/dev/sound/pci/emu10kx-pcm.c +++ b/sys/dev/sound/pci/emu10kx-pcm.c @@ -1539,5 +1539,5 @@ static driver_t emu_pcm_driver = { }; DRIVER_MODULE(snd_emu10kx_pcm, emu10kx, emu_pcm_driver, 0, 0); MODULE_DEPEND(snd_emu10kx_pcm, snd_emu10kx, SND_EMU10KX_MINVER, SND_EMU10KX_PREFVER, SND_EMU10KX_MAXVER); -MODULE_DEPEND(snd_emu10kx_pcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_emu10kx_pcm, sound, 1, 1, 1); MODULE_VERSION(snd_emu10kx_pcm, SND_EMU10KX_PREFVER); diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index 533c8aeddeb3..d240d94a449f 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -2684,6 +2684,6 @@ static driver_t envy24_driver = { }; DRIVER_MODULE(snd_envy24, pci, envy24_driver, 0, 0); -MODULE_DEPEND(snd_envy24, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_envy24, sound, 1, 1, 1); MODULE_DEPEND(snd_envy24, snd_spicds, 1, 1, 1); MODULE_VERSION(snd_envy24, 1); diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c index 34052ee869db..7489958d8b32 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -2578,6 +2578,6 @@ static driver_t envy24ht_driver = { }; DRIVER_MODULE(snd_envy24ht, pci, envy24ht_driver, 0, 0); -MODULE_DEPEND(snd_envy24ht, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_envy24ht, sound, 1, 1, 1); MODULE_DEPEND(snd_envy24ht, snd_spicds, 1, 1, 1); MODULE_VERSION(snd_envy24ht, 1); diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index 80d6adff2c75..5692f034f9e1 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -1934,5 +1934,5 @@ static driver_t es_driver = { }; DRIVER_MODULE(snd_es137x, pci, es_driver, 0, 0); -MODULE_DEPEND(snd_es137x, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_es137x, sound, 1, 1, 1); MODULE_VERSION(snd_es137x, 1); diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 65e1987abc6a..aa5c15b8fc93 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -753,5 +753,5 @@ static driver_t fm801_driver = { }; DRIVER_MODULE(snd_fm801, pci, fm801_driver, 0, 0); -MODULE_DEPEND(snd_fm801, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_fm801, sound, 1, 1, 1); MODULE_VERSION(snd_fm801, 1); diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index c11ce3c0bf6a..38dfb4cc7759 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -7211,5 +7211,5 @@ static driver_t hdaa_pcm_driver = { }; DRIVER_MODULE(snd_hda_pcm, hdaa, hdaa_pcm_driver, NULL, NULL); -MODULE_DEPEND(snd_hda, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_hda, sound, 1, 1, 1); MODULE_VERSION(snd_hda, 1); diff --git a/sys/dev/sound/pci/hdsp-pcm.c b/sys/dev/sound/pci/hdsp-pcm.c index 46bdc1f6ea7e..bce251079bb7 100644 --- a/sys/dev/sound/pci/hdsp-pcm.c +++ b/sys/dev/sound/pci/hdsp-pcm.c @@ -1186,5 +1186,5 @@ static driver_t hdsp_pcm_driver = { }; DRIVER_MODULE(snd_hdsp_pcm, hdsp, hdsp_pcm_driver, 0, 0); -MODULE_DEPEND(snd_hdsp, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_hdsp, sound, 1, 1, 1); MODULE_VERSION(snd_hdsp, 1); diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index ffd3a2cee1dc..c6b248503dab 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -1180,5 +1180,5 @@ static driver_t hdspe_pcm_driver = { }; DRIVER_MODULE(snd_hdspe_pcm, hdspe, hdspe_pcm_driver, 0, 0); -MODULE_DEPEND(snd_hdspe, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_hdspe, sound, 1, 1, 1); MODULE_VERSION(snd_hdspe, 1); diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index 7cb0983b17ef..5259cb5d3076 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -1236,5 +1236,5 @@ static driver_t ich_driver = { }; DRIVER_MODULE(snd_ich, pci, ich_driver, 0, 0); -MODULE_DEPEND(snd_ich, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_ich, sound, 1, 1, 1); MODULE_VERSION(snd_ich, 1); diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index 4f101ccdbfe6..36634c481b28 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -1789,5 +1789,5 @@ static driver_t m3_driver = { }; DRIVER_MODULE(snd_maestro3, pci, m3_driver, 0, 0); -MODULE_DEPEND(snd_maestro3, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_maestro3, sound, 1, 1, 1); MODULE_VERSION(snd_maestro3, 1); diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index 2813c7de57b3..c29962509057 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -818,5 +818,5 @@ static driver_t nm_driver = { }; DRIVER_MODULE(snd_neomagic, pci, nm_driver, 0, 0); -MODULE_DEPEND(snd_neomagic, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_neomagic, sound, 1, 1, 1); MODULE_VERSION(snd_neomagic, 1); diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index e7c32369a831..beb7482c703b 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -1071,5 +1071,5 @@ static driver_t ess_driver = { }; DRIVER_MODULE(snd_solo, pci, ess_driver, 0, 0); -MODULE_DEPEND(snd_solo, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_solo, sound, 1, 1, 1); MODULE_VERSION(snd_solo, 1); diff --git a/sys/dev/sound/pci/spicds.c b/sys/dev/sound/pci/spicds.c index 960aee8efdd8..a894f9fa73da 100644 --- a/sys/dev/sound/pci/spicds.c +++ b/sys/dev/sound/pci/spicds.c @@ -365,5 +365,5 @@ spicds_set(struct spicds_info *codec, int dir, unsigned int left, unsigned int r mtx_unlock(&codec->lock); } -MODULE_DEPEND(snd_spicds, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_spicds, sound, 1, 1, 1); MODULE_VERSION(snd_spicds, 1); diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index 83416976f603..86c875e9dc5c 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -1034,5 +1034,5 @@ static driver_t tr_driver = { }; DRIVER_MODULE(snd_t4dwave, pci, tr_driver, 0, 0); -MODULE_DEPEND(snd_t4dwave, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_t4dwave, sound, 1, 1, 1); MODULE_VERSION(snd_t4dwave, 1); diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 69ffc6a9e3be..c31bd52c3888 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -1435,5 +1435,5 @@ static driver_t via_driver = { }; DRIVER_MODULE(snd_via8233, pci, via_driver, 0, 0); -MODULE_DEPEND(snd_via8233, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_via8233, sound, 1, 1, 1); MODULE_VERSION(snd_via8233, 1); diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index b9fc1f9953fd..b655a52b74d6 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -642,5 +642,5 @@ static driver_t via_driver = { }; DRIVER_MODULE(snd_via82c686, pci, via_driver, 0, 0); -MODULE_DEPEND(snd_via82c686, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_via82c686, sound, 1, 1, 1); MODULE_VERSION(snd_via82c686, 1); diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index 445b8295085a..e0a12ae6df7c 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -940,5 +940,5 @@ static driver_t sonicvibes_driver = { }; DRIVER_MODULE(snd_vibes, pci, sonicvibes_driver, 0, 0); -MODULE_DEPEND(snd_vibes, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_vibes, sound, 1, 1, 1); MODULE_VERSION(snd_vibes, 1); diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index aa4f1d97e243..095286fb2ae2 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -742,4 +742,4 @@ sound_modevent(module_t mod, int type, void *data) } DEV_MODULE(sound, sound_modevent, NULL); -MODULE_VERSION(sound, SOUND_MODVER); +MODULE_VERSION(sound, 1); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 0a63acb16832..bd70f8c24aa6 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -91,12 +91,6 @@ struct snd_mixer; #define SND_STATUSLEN 64 -#define SOUND_MODVER 5 - -#define SOUND_MINVER SOUND_MODVER -#define SOUND_PREFVER SOUND_MODVER -#define SOUND_MAXVER SOUND_MODVER - #define SD_F_SIMPLEX 0x00000001 /* unused 0x00000002 */ #define SD_F_SOFTPCMVOL 0x00000004 diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 80c35aca89bc..e043a7a9ef0a 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -6422,7 +6422,7 @@ uaudio_hid_detach(struct uaudio_softc *sc) DRIVER_MODULE_ORDERED(snd_uaudio, uhub, uaudio_driver, NULL, NULL, SI_ORDER_ANY); MODULE_DEPEND(snd_uaudio, usb, 1, 1, 1); -MODULE_DEPEND(snd_uaudio, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_uaudio, sound, 1, 1, 1); MODULE_DEPEND(snd_uaudio, hid, 1, 1, 1); MODULE_VERSION(snd_uaudio, 1); USB_PNP_HOST_INFO(uaudio_devs); diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c index 4b1762cfc3ec..1317c0c7f41d 100644 --- a/sys/dev/sound/usb/uaudio_pcm.c +++ b/sys/dev/sound/usb/uaudio_pcm.c @@ -203,5 +203,5 @@ static driver_t ua_pcm_driver = { DRIVER_MODULE(ua_pcm, uaudio, ua_pcm_driver, 0, 0); MODULE_DEPEND(ua_pcm, snd_uaudio, 1, 1, 1); -MODULE_DEPEND(ua_pcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(ua_pcm, sound, 1, 1, 1); MODULE_VERSION(ua_pcm, 1);