Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Jan 2024 16:50:06 GMT
From:      Christos Margiolis <christos@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 06a4376346e5 - main - snd_uaudio: prefix module declaration with "snd_"
Message-ID:  <202401161650.40GGo6r9074302@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=06a4376346e55d1c7aefe7a48063dddc4d1da9b9

commit 06a4376346e55d1c7aefe7a48063dddc4d1da9b9
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2024-01-16 16:48:49 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2024-01-16 16:48:49 +0000

    snd_uaudio: prefix module declaration with "snd_"
    
    Although the module is compiled "snd_uaudio.ko", follow the rest of the
    sound modules' naming convention in the declaration as well.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      2 weeks
    Reviewed by:    imp, emaste
    Differential Revision:  https://reviews.freebsd.org/D43396
---
 sys/dev/sound/usb/uaudio.c     | 10 +++++-----
 sys/dev/sound/usb/uaudio_pcm.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 36985d4666a4..ebbff0e633e4 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -6230,10 +6230,10 @@ 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, 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);
-MODULE_VERSION(uaudio, 1);
+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, hid, 1, 1, 1);
+MODULE_VERSION(snd_uaudio, 1);
 USB_PNP_HOST_INFO(uaudio_devs);
 USB_PNP_HOST_INFO(uaudio_vendor_midi);
diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c
index bf1f2ebb5e33..9b17cb232907 100644
--- a/sys/dev/sound/usb/uaudio_pcm.c
+++ b/sys/dev/sound/usb/uaudio_pcm.c
@@ -235,6 +235,6 @@ static driver_t ua_pcm_driver = {
 };
 
 DRIVER_MODULE(ua_pcm, uaudio, ua_pcm_driver, 0, 0);
-MODULE_DEPEND(ua_pcm, uaudio, 1, 1, 1);
+MODULE_DEPEND(ua_pcm, snd_uaudio, 1, 1, 1);
 MODULE_DEPEND(ua_pcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
 MODULE_VERSION(ua_pcm, 1);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401161650.40GGo6r9074302>