From 2287364e040b5de67db7a333a97f815b9304ddf4 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 6 May 2022 15:46:56 -0700
Subject: [PATCH] Remove pcm_devclass from DRIVER_MODULE invocations.

---
 sys/arm/allwinner/a10_codec.c            | 2 +-
 sys/arm/allwinner/a10_hdmiaudio.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/sound/fdt/audio_soc.c            | 2 +-
 sys/dev/sound/isa/ad1816.c               | 4 ++--
 sys/dev/sound/isa/ess.c                  | 2 +-
 sys/dev/sound/isa/mss.c                  | 8 ++++----
 sys/dev/sound/isa/sb16.c                 | 2 +-
 sys/dev/sound/isa/sb8.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/csapcm.c               | 2 +-
 sys/dev/sound/pci/emu10k1.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/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/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/usb/uaudio_pcm.c           | 2 +-
 35 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/sys/arm/allwinner/a10_codec.c b/sys/arm/allwinner/a10_codec.c
index 0780a7328bbe..c0f0862cadf4 100644
--- a/sys/arm/allwinner/a10_codec.c
+++ b/sys/arm/allwinner/a10_codec.c
@@ -1206,6 +1206,6 @@ static driver_t a10codec_pcm_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(a10codec, simplebus, a10codec_pcm_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(a10codec, simplebus, a10codec_pcm_driver, 0, 0);
 MODULE_DEPEND(a10codec, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(a10codec, 1);
diff --git a/sys/arm/allwinner/a10_hdmiaudio.c b/sys/arm/allwinner/a10_hdmiaudio.c
index 13e58ce8642b..13fe2ea7f1b7 100644
--- a/sys/arm/allwinner/a10_hdmiaudio.c
+++ b/sys/arm/allwinner/a10_hdmiaudio.c
@@ -430,6 +430,6 @@ static driver_t a10hdmiaudio_pcm_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(a10hdmiaudio, simplebus, a10hdmiaudio_pcm_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(a10hdmiaudio, simplebus, a10hdmiaudio_pcm_driver, 0, 0);
 MODULE_DEPEND(a10hdmiaudio, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(a10hdmiaudio, 1);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c
index da5939ec33cb..36b1dc86535b 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c
@@ -964,7 +964,7 @@ static driver_t bcm2835_audio_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(bcm2835_audio, vchiq, bcm2835_audio_driver, pcm_devclass, 0, 0);
+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, 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 8871e2dfbbfe..44d2547ac9ae 100644
--- a/sys/arm/freescale/imx/imx6_ssi.c
+++ b/sys/arm/freescale/imx/imx6_ssi.c
@@ -853,7 +853,7 @@ static driver_t ssi_pcm_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(ssi, simplebus, ssi_pcm_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(ssi, simplebus, ssi_pcm_driver, 0, 0);
 MODULE_DEPEND(ssi, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 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 87d648da05fd..95217e4aef4e 100644
--- a/sys/arm/freescale/vybrid/vf_sai.c
+++ b/sys/arm/freescale/vybrid/vf_sai.c
@@ -799,6 +799,6 @@ static driver_t sai_pcm_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(sai, simplebus, sai_pcm_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(sai, simplebus, sai_pcm_driver, 0, 0);
 MODULE_DEPEND(sai, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(sai, 1);
diff --git a/sys/dev/sound/fdt/audio_soc.c b/sys/dev/sound/fdt/audio_soc.c
index 627bd26094ba..d85d8fb80503 100644
--- a/sys/dev/sound/fdt/audio_soc.c
+++ b/sys/dev/sound/fdt/audio_soc.c
@@ -536,5 +536,5 @@ static driver_t audio_soc_driver = {
 	sizeof(struct audio_soc_softc),
 };
 
-DRIVER_MODULE(audio_soc, simplebus, audio_soc_driver, pcm_devclass, NULL, NULL);
+DRIVER_MODULE(audio_soc, simplebus, audio_soc_driver, NULL, NULL);
 MODULE_VERSION(audio_soc, 1);
diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index b348158cbfd2..9b51f0dbbf5f 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -681,7 +681,7 @@ static driver_t ad1816_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_ad1816, isa, ad1816_driver, pcm_devclass, 0, 0);
-DRIVER_MODULE(snd_ad1816, acpi, ad1816_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_ad1816, isa, ad1816_driver, 0, 0);
+DRIVER_MODULE(snd_ad1816, acpi, ad1816_driver, 0, 0);
 MODULE_DEPEND(snd_ad1816, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_ad1816, 1);
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index b982b051fbaf..cf2679e120fd 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -939,7 +939,7 @@ static driver_t ess_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_ess, sbc, ess_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_ess, sbc, ess_driver, 0, 0);
 MODULE_DEPEND(snd_ess, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_DEPEND(snd_ess, snd_sbc, 1, 1, 1);
 MODULE_VERSION(snd_ess, 1);
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index d0740e59de04..a26dd9c62ab5 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -1894,7 +1894,7 @@ static driver_t mss_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_mss, isa, mss_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_mss, isa, mss_driver, 0, 0);
 MODULE_DEPEND(snd_mss, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_mss, 1);
 
@@ -2204,8 +2204,8 @@ static driver_t pnpmss_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_pnpmss, isa, pnpmss_driver, pcm_devclass, 0, 0);
-DRIVER_MODULE(snd_pnpmss, acpi, pnpmss_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_pnpmss, isa, pnpmss_driver, 0, 0);
+DRIVER_MODULE(snd_pnpmss, acpi, pnpmss_driver, 0, 0);
 MODULE_DEPEND(snd_pnpmss, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_pnpmss, 1);
 
@@ -2289,7 +2289,7 @@ static driver_t guspcm_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_guspcm, gusc, guspcm_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_guspcm, gusc, guspcm_driver, 0, 0);
 MODULE_DEPEND(snd_guspcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_guspcm, 1);
 ISA_PNP_INFO(pnpmss_ids);
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index cc65fe418350..cece651951ff 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -906,7 +906,7 @@ static driver_t sb16_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_sb16, sbc, sb16_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_sb16, sbc, sb16_driver, 0, 0);
 MODULE_DEPEND(snd_sb16, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_DEPEND(snd_sb16, snd_sbc, 1, 1, 1);
 MODULE_VERSION(snd_sb16, 1);
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index ff348aed30b6..3d3ac9d84ec8 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -797,7 +797,7 @@ static driver_t sb_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_sb8, sbc, sb_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_sb8, sbc, sb_driver, 0, 0);
 MODULE_DEPEND(snd_sb8, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_DEPEND(snd_sb8, snd_sbc, 1, 1, 1);
 MODULE_VERSION(snd_sb8, 1);
diff --git a/sys/dev/sound/macio/davbus.c b/sys/dev/sound/macio/davbus.c
index c174ec155416..e62aaf99ba12 100644
--- a/sys/dev/sound/macio/davbus.c
+++ b/sys/dev/sound/macio/davbus.c
@@ -87,7 +87,7 @@ static driver_t pcm_davbus_driver = {
 	PCM_SOFTC_SIZE
 };
 
-DRIVER_MODULE(pcm_davbus, macio, pcm_davbus_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(pcm_davbus, macio, pcm_davbus_driver, 0, 0);
 MODULE_DEPEND(pcm_davbus, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 
 /*****************************************************************************
diff --git a/sys/dev/sound/macio/i2s.c b/sys/dev/sound/macio/i2s.c
index 4d675eb9461d..c5ce3979832a 100644
--- a/sys/dev/sound/macio/i2s.c
+++ b/sys/dev/sound/macio/i2s.c
@@ -120,7 +120,7 @@ static driver_t pcm_i2s_driver = {
 	PCM_SOFTC_SIZE
 };
 
-DRIVER_MODULE(pcm_i2s, macio, pcm_i2s_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(pcm_i2s, macio, pcm_i2s_driver, 0, 0);
 MODULE_DEPEND(pcm_i2s, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 
 static int	aoagpio_probe(device_t);
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index d12b262e825e..74307b36ee00 100644
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -936,6 +936,6 @@ static driver_t als_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_als4000, pci, als_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_als4000, pci, als_driver, 0, 0);
 MODULE_DEPEND(snd_als4000, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_als4000, 1);
diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c
index ff676b97ebed..1ec3bf16d5a7 100644
--- a/sys/dev/sound/pci/atiixp.c
+++ b/sys/dev/sound/pci/atiixp.c
@@ -1417,6 +1417,6 @@ static driver_t atiixp_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_atiixp, pci, atiixp_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_atiixp, pci, atiixp_driver, 0, 0);
 MODULE_DEPEND(snd_atiixp, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_atiixp, 1);
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index bc467aed1ffa..9a555996823f 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -1106,7 +1106,7 @@ static driver_t cmi_driver = {
 	PCM_SOFTC_SIZE
 };
 
-DRIVER_MODULE(snd_cmi, pci, cmi_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_cmi, pci, cmi_driver, 0, 0);
 MODULE_DEPEND(snd_cmi, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 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 5b52cf4d997b..7d38b3bd836c 100644
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -964,6 +964,6 @@ static driver_t cs4281_driver = {
     PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_cs4281, pci, cs4281_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_cs4281, pci, cs4281_driver, 0, 0);
 MODULE_DEPEND(snd_cs4281, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_cs4281, 1);
diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index e71821a50c6a..5f06abb8d101 100644
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -1035,7 +1035,7 @@ static driver_t pcmcsa_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_csapcm, csa, pcmcsa_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_csapcm, csa, pcmcsa_driver, 0, 0);
 MODULE_DEPEND(snd_csapcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 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 b0e7d5b3c204..efb63313715f 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -2193,7 +2193,7 @@ static driver_t emu_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_emu10k1, pci, emu_driver, pcm_devclass, NULL, NULL);
+DRIVER_MODULE(snd_emu10k1, pci, emu_driver, NULL, NULL);
 MODULE_DEPEND(snd_emu10k1, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_emu10k1, 1);
 MODULE_DEPEND(snd_emu10k1, midi, 1, 1, 1);
diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c
index 5f66799ab902..f9d82ad5de06 100644
--- a/sys/dev/sound/pci/emu10kx-pcm.c
+++ b/sys/dev/sound/pci/emu10kx-pcm.c
@@ -1530,7 +1530,7 @@ static driver_t emu_pcm_driver = {
 	0,
 	NULL
 };
-DRIVER_MODULE(snd_emu10kx_pcm, emu10kx, emu_pcm_driver, pcm_devclass, 0, 0);
+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_VERSION(snd_emu10kx_pcm, SND_EMU10KX_PREFVER);
diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c
index 7c1ba58b5708..742102255e5f 100644
--- a/sys/dev/sound/pci/envy24.c
+++ b/sys/dev/sound/pci/envy24.c
@@ -2686,7 +2686,7 @@ static driver_t envy24_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_envy24, pci, envy24_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_envy24, pci, envy24_driver, 0, 0);
 MODULE_DEPEND(snd_envy24, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 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 608afe33ca9f..de8a269ed03e 100644
--- a/sys/dev/sound/pci/envy24ht.c
+++ b/sys/dev/sound/pci/envy24ht.c
@@ -2582,7 +2582,7 @@ static driver_t envy24ht_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_envy24ht, pci, envy24ht_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_envy24ht, pci, envy24ht_driver, 0, 0);
 MODULE_DEPEND(snd_envy24ht, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 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 351b7f5ed287..315ed8c5a130 100644
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -1941,6 +1941,6 @@ static driver_t es_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_es137x, pci, es_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_es137x, pci, es_driver, 0, 0);
 MODULE_DEPEND(snd_es137x, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_es137x, 1);
diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
index 3a7e0877ae7a..0639fb0a1ac9 100644
--- a/sys/dev/sound/pci/fm801.c
+++ b/sys/dev/sound/pci/fm801.c
@@ -759,6 +759,6 @@ static driver_t fm801_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_fm801, pci, fm801_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_fm801, pci, fm801_driver, 0, 0);
 MODULE_DEPEND(snd_fm801, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_fm801, 1);
diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c
index 91c0892111a2..d2c8c4f3189e 100644
--- a/sys/dev/sound/pci/hda/hdaa.c
+++ b/sys/dev/sound/pci/hda/hdaa.c
@@ -7156,6 +7156,6 @@ static driver_t hdaa_pcm_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_hda_pcm, hdaa, hdaa_pcm_driver, pcm_devclass, NULL, NULL);
+DRIVER_MODULE(snd_hda_pcm, hdaa, hdaa_pcm_driver, NULL, NULL);
 MODULE_DEPEND(snd_hda, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_hda, 1);
diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c
index 9cd1913353a2..415321b8f0fb 100644
--- a/sys/dev/sound/pci/hdspe-pcm.c
+++ b/sys/dev/sound/pci/hdspe-pcm.c
@@ -767,6 +767,6 @@ static driver_t hdspe_pcm_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_hdspe_pcm, hdspe, hdspe_pcm_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_hdspe_pcm, hdspe, hdspe_pcm_driver, 0, 0);
 MODULE_DEPEND(snd_hdspe, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_hdspe, 1);
diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
index 2ee8c00cd6e4..9855215fbba0 100644
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -1237,6 +1237,6 @@ static driver_t ich_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_ich, pci, ich_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_ich, pci, ich_driver, 0, 0);
 MODULE_DEPEND(snd_ich, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_ich, 1);
diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index 77b85f20c327..ec8eb6878d62 100644
--- a/sys/dev/sound/pci/maestro3.c
+++ b/sys/dev/sound/pci/maestro3.c
@@ -1794,6 +1794,6 @@ static driver_t m3_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_maestro3, pci, m3_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_maestro3, pci, m3_driver, 0, 0);
 MODULE_DEPEND(snd_maestro3, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_maestro3, 1);
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 5e3805645cf2..d13b45f0b2bd 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -817,6 +817,6 @@ static driver_t nm_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_neomagic, pci, nm_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_neomagic, pci, nm_driver, 0, 0);
 MODULE_DEPEND(snd_neomagic, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_neomagic, 1);
diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
index 7132a7f34dee..e45ada420c6f 100644
--- a/sys/dev/sound/pci/solo.c
+++ b/sys/dev/sound/pci/solo.c
@@ -1072,6 +1072,6 @@ static driver_t ess_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_solo, pci, ess_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_solo, pci, ess_driver, 0, 0);
 MODULE_DEPEND(snd_solo, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_solo, 1);
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index b30d269f5eef..7fc27db1aabe 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -1033,6 +1033,6 @@ static driver_t tr_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_t4dwave, pci, tr_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_t4dwave, pci, tr_driver, 0, 0);
 MODULE_DEPEND(snd_t4dwave, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_t4dwave, 1);
diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
index de8c4738666b..8e875462f1cf 100644
--- a/sys/dev/sound/pci/via8233.c
+++ b/sys/dev/sound/pci/via8233.c
@@ -1440,6 +1440,6 @@ static driver_t via_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_via8233, pci, via_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_via8233, pci, via_driver, 0, 0);
 MODULE_DEPEND(snd_via8233, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_via8233, 1);
diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index 88a162f7eb7c..8ea241f0ec52 100644
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -642,6 +642,6 @@ static driver_t via_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_via82c686, pci, via_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_via82c686, pci, via_driver, 0, 0);
 MODULE_DEPEND(snd_via82c686, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_via82c686, 1);
diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
index 931de7300a3b..0089b9ba6afe 100644
--- a/sys/dev/sound/pci/vibes.c
+++ b/sys/dev/sound/pci/vibes.c
@@ -939,6 +939,6 @@ static driver_t sonicvibes_driver = {
         PCM_SOFTC_SIZE
 };
 
-DRIVER_MODULE(snd_vibes, pci, sonicvibes_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(snd_vibes, pci, sonicvibes_driver, 0, 0);
 MODULE_DEPEND(snd_vibes, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(snd_vibes, 1);
diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c
index 9c4666c41bba..6815727a18e5 100644
--- a/sys/dev/sound/usb/uaudio_pcm.c
+++ b/sys/dev/sound/usb/uaudio_pcm.c
@@ -236,7 +236,7 @@ static driver_t ua_pcm_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(ua_pcm, uaudio, ua_pcm_driver, pcm_devclass, 0, 0);
+DRIVER_MODULE(ua_pcm, uaudio, ua_pcm_driver, 0, 0);
 MODULE_DEPEND(ua_pcm, uaudio, 1, 1, 1);
 MODULE_DEPEND(ua_pcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(ua_pcm, 1);