git: 3390adfe4200 - main - sound: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 May 2022 23:24:54 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=3390adfe4200c19fe86fa690c9e77f9b58d7288a
commit 3390adfe4200c19fe86fa690c9e77f9b58d7288a
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-06 22:46:56 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-06 22:46:56 +0000
sound: Remove unused devclass arguments to DRIVER_MODULE.
---
sys/dev/sound/fdt/dummy_codec.c | 4 +---
sys/dev/sound/fdt/simple_amplifier.c | 4 +---
sys/dev/sound/isa/ess.c | 6 ++----
sys/dev/sound/isa/gusc.c | 6 ++----
sys/dev/sound/isa/sbc.c | 6 ++----
sys/dev/sound/macio/i2s.c | 3 +--
sys/dev/sound/macio/onyx.c | 3 +--
sys/dev/sound/macio/snapper.c | 3 +--
sys/dev/sound/macio/tumbler.c | 3 +--
sys/dev/sound/pci/csa.c | 4 +---
sys/dev/sound/pci/csamidi.c | 3 +--
sys/dev/sound/pci/emu10k1.c | 4 +---
sys/dev/sound/pci/emu10kx-midi.c | 3 +--
sys/dev/sound/pci/emu10kx.c | 4 +---
sys/dev/sound/pci/hda/hdaa.c | 4 +---
sys/dev/sound/pci/hda/hdac.c | 4 +---
sys/dev/sound/pci/hda/hdacc.c | 4 +---
sys/dev/sound/pci/hdspe.c | 4 +---
sys/dev/sound/usb/uaudio.c | 4 +---
19 files changed, 22 insertions(+), 54 deletions(-)
diff --git a/sys/dev/sound/fdt/dummy_codec.c b/sys/dev/sound/fdt/dummy_codec.c
index 6be2491a069d..20c5ff715b9b 100644
--- a/sys/dev/sound/fdt/dummy_codec.c
+++ b/sys/dev/sound/fdt/dummy_codec.c
@@ -121,7 +121,5 @@ static driver_t dummy_codec_driver = {
sizeof(struct dummy_codec_softc),
};
-static devclass_t dummy_codec_devclass;
-
-DRIVER_MODULE(dummy_codec, simplebus, dummy_codec_driver, dummy_codec_devclass, 0, 0);
+DRIVER_MODULE(dummy_codec, simplebus, dummy_codec_driver, 0, 0);
SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/dev/sound/fdt/simple_amplifier.c b/sys/dev/sound/fdt/simple_amplifier.c
index a0531914d9be..c8d265a7fd32 100644
--- a/sys/dev/sound/fdt/simple_amplifier.c
+++ b/sys/dev/sound/fdt/simple_amplifier.c
@@ -200,7 +200,5 @@ static driver_t simple_amp_driver = {
sizeof(struct simple_amp_softc),
};
-static devclass_t simple_amp_devclass;
-
-DRIVER_MODULE(simple_amp, simplebus, simple_amp_driver, simple_amp_devclass, 0, 0);
+DRIVER_MODULE(simple_amp, simplebus, simple_amp_driver, 0, 0);
SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index cf2679e120fd..efe08143424d 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -946,8 +946,6 @@ MODULE_VERSION(snd_ess, 1);
/************************************************************/
-static devclass_t esscontrol_devclass;
-
static struct isa_pnp_id essc_ids[] = {
{0x06007316, "ESS Control"},
{0}
@@ -1010,6 +1008,6 @@ static driver_t esscontrol_driver = {
1,
};
-DRIVER_MODULE(esscontrol, isa, esscontrol_driver, esscontrol_devclass, 0, 0);
-DRIVER_MODULE(esscontrol, acpi, esscontrol_driver, esscontrol_devclass, 0, 0);
+DRIVER_MODULE(esscontrol, isa, esscontrol_driver, 0, 0);
+DRIVER_MODULE(esscontrol, acpi, esscontrol_driver, 0, 0);
ISA_PNP_INFO(essc_ids);
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index 6fd49ca1ea7e..63bc3c1e0073 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -101,8 +101,6 @@ static device_t find_masterdev(sc_p scp);
static int alloc_resource(sc_p scp);
static int release_resource(sc_p scp);
-static devclass_t gusc_devclass;
-
static int
gusc_probe(device_t dev)
{
@@ -669,8 +667,8 @@ static driver_t gusc_driver = {
/*
* gusc can be attached to an isa bus.
*/
-DRIVER_MODULE(snd_gusc, isa, gusc_driver, gusc_devclass, 0, 0);
-DRIVER_MODULE(snd_gusc, acpi, gusc_driver, gusc_devclass, 0, 0);
+DRIVER_MODULE(snd_gusc, isa, gusc_driver, 0, 0);
+DRIVER_MODULE(snd_gusc, acpi, gusc_driver, 0, 0);
MODULE_DEPEND(snd_gusc, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
MODULE_VERSION(snd_gusc, 1);
ISA_PNP_INFO(gusc_ids);
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index 3c6dd3bba97d..344e0c2dd2d3 100644
--- a/sys/dev/sound/isa/sbc.c
+++ b/sys/dev/sound/isa/sbc.c
@@ -96,8 +96,6 @@ static int sbc_teardown_intr(device_t dev, device_t child, struct resource *irq,
static int alloc_resource(struct sbc_softc *scp);
static int release_resource(struct sbc_softc *scp);
-static devclass_t sbc_devclass;
-
static int io_range[3] = {0x10, 0x2, 0x4};
static int sb_rd(struct resource *io, int reg);
@@ -747,8 +745,8 @@ static driver_t sbc_driver = {
};
/* sbc can be attached to an isa bus. */
-DRIVER_MODULE(snd_sbc, isa, sbc_driver, sbc_devclass, 0, 0);
-DRIVER_MODULE(snd_sbc, acpi, sbc_driver, sbc_devclass, 0, 0);
+DRIVER_MODULE(snd_sbc, isa, sbc_driver, 0, 0);
+DRIVER_MODULE(snd_sbc, acpi, sbc_driver, 0, 0);
MODULE_DEPEND(snd_sbc, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
MODULE_VERSION(snd_sbc, 1);
ISA_PNP_INFO(sbc_ids);
diff --git a/sys/dev/sound/macio/i2s.c b/sys/dev/sound/macio/i2s.c
index c5ce3979832a..a86b97609c96 100644
--- a/sys/dev/sound/macio/i2s.c
+++ b/sys/dev/sound/macio/i2s.c
@@ -146,9 +146,8 @@ static driver_t aoagpio_driver = {
aoagpio_methods,
sizeof(struct aoagpio_softc)
};
-static devclass_t aoagpio_devclass;
-DRIVER_MODULE(aoagpio, macgpio, aoagpio_driver, aoagpio_devclass, 0, 0);
+DRIVER_MODULE(aoagpio, macgpio, aoagpio_driver, 0, 0);
/*****************************************************************************
Probe and attachment routines.
diff --git a/sys/dev/sound/macio/onyx.c b/sys/dev/sound/macio/onyx.c
index c258723c8419..86b9e350db36 100644
--- a/sys/dev/sound/macio/onyx.c
+++ b/sys/dev/sound/macio/onyx.c
@@ -90,9 +90,8 @@ static driver_t onyx_driver = {
onyx_methods,
sizeof(struct onyx_softc)
};
-static devclass_t onyx_devclass;
-DRIVER_MODULE(onyx, iicbus, onyx_driver, onyx_devclass, 0, 0);
+DRIVER_MODULE(onyx, iicbus, onyx_driver, 0, 0);
MODULE_VERSION(onyx, 1);
MODULE_DEPEND(onyx, iicbus, 1, 1, 1);
diff --git a/sys/dev/sound/macio/snapper.c b/sys/dev/sound/macio/snapper.c
index fe30357c99fc..8ed98366df34 100644
--- a/sys/dev/sound/macio/snapper.c
+++ b/sys/dev/sound/macio/snapper.c
@@ -116,9 +116,8 @@ static driver_t snapper_driver = {
snapper_methods,
sizeof(struct snapper_softc)
};
-static devclass_t snapper_devclass;
-DRIVER_MODULE(snapper, iicbus, snapper_driver, snapper_devclass, 0, 0);
+DRIVER_MODULE(snapper, iicbus, snapper_driver, 0, 0);
MODULE_VERSION(snapper, 1);
MODULE_DEPEND(snapper, iicbus, 1, 1, 1);
diff --git a/sys/dev/sound/macio/tumbler.c b/sys/dev/sound/macio/tumbler.c
index 180482e47215..b1ec926e99cd 100644
--- a/sys/dev/sound/macio/tumbler.c
+++ b/sys/dev/sound/macio/tumbler.c
@@ -116,9 +116,8 @@ static driver_t tumbler_driver = {
tumbler_methods,
sizeof(struct tumbler_softc)
};
-static devclass_t tumbler_devclass;
-DRIVER_MODULE(tumbler, iicbus, tumbler_driver, tumbler_devclass, 0, 0);
+DRIVER_MODULE(tumbler, iicbus, tumbler_driver, 0, 0);
MODULE_VERSION(tumbler, 1);
MODULE_DEPEND(tumbler, iicbus, 1, 1, 1);
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index 61f4d750df2d..28c22af91365 100644
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -98,8 +98,6 @@ static int csa_initialize(sc_p scp);
static int csa_downloadimage(csa_res *resp);
static int csa_transferimage(csa_res *resp, u_int32_t *src, u_long dest, u_long len);
-static devclass_t csa_devclass;
-
static void
amp_none(void)
{
@@ -1107,6 +1105,6 @@ static driver_t csa_driver = {
/*
* csa can be attached to a pci bus.
*/
-DRIVER_MODULE(snd_csa, pci, csa_driver, csa_devclass, 0, 0);
+DRIVER_MODULE(snd_csa, pci, csa_driver, 0, 0);
MODULE_DEPEND(snd_csa, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
MODULE_VERSION(snd_csa, 1);
diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c
index a013f8d9f3e6..809c7c039b32 100644
--- a/sys/dev/sound/pci/csamidi.c
+++ b/sys/dev/sound/pci/csamidi.c
@@ -81,7 +81,6 @@ struct csa_midi_softc {
};
static struct kobj_class csamidi_mpu_class;
-static devclass_t midicsa_devclass;
static u_int32_t
csamidi_readio(struct csa_midi_softc *scp, u_long offset)
@@ -282,7 +281,7 @@ static driver_t midicsa_driver = {
midicsa_methods,
sizeof(struct csa_midi_softc),
};
-DRIVER_MODULE(snd_csa_midi, csa, midicsa_driver, midicsa_devclass, 0, 0);
+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_VERSION(snd_csa_midi, 1);
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index efb63313715f..63230f0f55ec 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -2247,6 +2247,4 @@ static driver_t emujoy_driver = {
1 /* no softc */
};
-static devclass_t emujoy_devclass;
-
-DRIVER_MODULE(emujoy, pci, emujoy_driver, emujoy_devclass, NULL, NULL);
+DRIVER_MODULE(emujoy, pci, emujoy_driver, NULL, NULL);
diff --git a/sys/dev/sound/pci/emu10kx-midi.c b/sys/dev/sound/pci/emu10kx-midi.c
index a458b6993c08..a22cea81c688 100644
--- a/sys/dev/sound/pci/emu10kx-midi.c
+++ b/sys/dev/sound/pci/emu10kx-midi.c
@@ -68,7 +68,6 @@ struct emu_midi_softc {
};
static uint32_t emu_midi_card_intr(void *p, uint32_t arg);
-static devclass_t emu_midi_devclass;
static unsigned char
emu_mread(struct mpu401 *arg __unused, void *cookie, int reg)
@@ -248,7 +247,7 @@ static driver_t emu_midi_driver = {
emu_midi_methods,
sizeof(struct emu_midi_softc),
};
-DRIVER_MODULE(snd_emu10kx_midi, emu10kx, emu_midi_driver, emu_midi_devclass, 0, 0);
+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_VERSION(snd_emu10kx_midi, SND_EMU10KX_PREFVER);
diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c
index 9d321997487f..ff3a8e9b67c5 100644
--- a/sys/dev/sound/pci/emu10kx.c
+++ b/sys/dev/sound/pci/emu10kx.c
@@ -3539,7 +3539,5 @@ emu_modevent(module_t mod __unused, int cmd, void *data __unused)
}
-static devclass_t emu_devclass;
-
-DRIVER_MODULE(snd_emu10kx, pci, emu_driver, emu_devclass, emu_modevent, NULL);
+DRIVER_MODULE(snd_emu10kx, pci, emu_driver, emu_modevent, NULL);
MODULE_VERSION(snd_emu10kx, SND_EMU10KX_PREFVER);
diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c
index d2c8c4f3189e..07531d17d8f2 100644
--- a/sys/dev/sound/pci/hda/hdaa.c
+++ b/sys/dev/sound/pci/hda/hdaa.c
@@ -6847,9 +6847,7 @@ static driver_t hdaa_driver = {
sizeof(struct hdaa_devinfo),
};
-static devclass_t hdaa_devclass;
-
-DRIVER_MODULE(snd_hda, hdacc, hdaa_driver, hdaa_devclass, NULL, NULL);
+DRIVER_MODULE(snd_hda, hdacc, hdaa_driver, NULL, NULL);
static void
hdaa_chan_formula(struct hdaa_devinfo *devinfo, int asid,
diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c
index 8415d63daa69..764a2739c76f 100644
--- a/sys/dev/sound/pci/hda/hdac.c
+++ b/sys/dev/sound/pci/hda/hdac.c
@@ -2170,6 +2170,4 @@ static driver_t hdac_driver = {
sizeof(struct hdac_softc),
};
-static devclass_t hdac_devclass;
-
-DRIVER_MODULE(snd_hda, pci, hdac_driver, hdac_devclass, NULL, NULL);
+DRIVER_MODULE(snd_hda, pci, hdac_driver, NULL, NULL);
diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c
index 7f511e897ab8..e48f0ec82f83 100644
--- a/sys/dev/sound/pci/hda/hdacc.c
+++ b/sys/dev/sound/pci/hda/hdacc.c
@@ -795,6 +795,4 @@ static driver_t hdacc_driver = {
sizeof(struct hdacc_softc),
};
-static devclass_t hdacc_devclass;
-
-DRIVER_MODULE(snd_hda, hdac, hdacc_driver, hdacc_devclass, NULL, NULL);
+DRIVER_MODULE(snd_hda, hdac, hdacc_driver, NULL, NULL);
diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c
index 48e72e227aeb..163e6665f0d1 100644
--- a/sys/dev/sound/pci/hdspe.c
+++ b/sys/dev/sound/pci/hdspe.c
@@ -397,6 +397,4 @@ static driver_t hdspe_driver = {
PCM_SOFTC_SIZE,
};
-static devclass_t hdspe_devclass;
-
-DRIVER_MODULE(snd_hdspe, pci, hdspe_driver, hdspe_devclass, 0, 0);
+DRIVER_MODULE(snd_hdspe, pci, hdspe_driver, 0, 0);
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 621fd481c8c8..a6722ee5b399 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -700,8 +700,6 @@ static const struct usb_config
},
};
-static devclass_t uaudio_devclass;
-
static device_method_t uaudio_methods[] = {
DEVMETHOD(device_probe, uaudio_probe),
DEVMETHOD(device_attach, uaudio_attach),
@@ -6229,7 +6227,7 @@ uaudio_hid_detach(struct uaudio_softc *sc)
usbd_transfer_unsetup(sc->sc_hid.xfer, UAUDIO_HID_N_TRANSFER);
}
-DRIVER_MODULE_ORDERED(uaudio, uhub, uaudio_driver, uaudio_devclass, NULL, 0, SI_ORDER_ANY);
+DRIVER_MODULE_ORDERED(uaudio, uhub, uaudio_driver, NULL, NULL, SI_ORDER_ANY);
MODULE_DEPEND(uaudio, usb, 1, 1, 1);
MODULE_DEPEND(uaudio, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
MODULE_DEPEND(uaudio, hid, 1, 1, 1);