sound: Remove unused devclass arguments to DRIVER_MODULE.

This commit is contained in:
John Baldwin 2022-05-06 15:46:56 -07:00
parent 2287364e04
commit 3390adfe42
19 changed files with 22 additions and 54 deletions

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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.

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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,

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);