From nobody Tue Jan 30 11:08:26 2024 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 4TPMpz1S6yz58dVb; Tue, 30 Jan 2024 11:08:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPMpy61kzz4HYy; Tue, 30 Jan 2024 11:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706612906; 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=ItlOU8liOA7aB5MdFK1lD1z3R8kG2qfq5+v+W+BY4eQ=; b=mDIAac9hEetpEZESq97tJlVD4lwLy+nNqrFDAu1007428aL0Njw/GnwX7pwsG8o/+YLtQD cGe9Z0ysHsymNo512pZCsm/oGw4y5aojpyIrQxCKohPzsDLtRDpbArCpAaPEN8z5TcIVfC GpJEOIT0kDLj8A68/WLfoh6ZttgtzxLElz+gesil2Q3Ohm3Ppna7NvceuXob5xg3T13waH sLJWYnjHn0HyRm0sJjsXpe+m7pFP0hBmkOtdQiEQIqxpgTZwwdwwOatCNSQe0cOd/D1DiZ Lbhzw+2bfWQWZVgO/AUcknJyGHEy8Mgi/fGA/Wq8c3cdplP/VMy7kGTxCDf8OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706612906; 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=ItlOU8liOA7aB5MdFK1lD1z3R8kG2qfq5+v+W+BY4eQ=; b=a/6JZO21M6MVeBP2zIGRlbWQsYzosbml7/VT233dwgqh6CTQx3koQ2RYj0xKjHchCnAAFV BmMVUY67xWZtx91m6knRfycVs/wLy0/NhNEqEXeLweywN6Y2uUbqP8glDAlQvaWhrLYGCb 5ngypZKi23AJvxnnOKE6EwJfBEU8x8fQXXwiR4NvjKSotIIK2ewuf2KOzk15LEzFfzsrG7 6f295OWgUgvJJMatJYzLG+GQ39Oy4IHl1uBjvl05haGXlALiPWZrQ2vi6GYM/ffbB9H5Vf dsEniLgfiPdhanodm8huEyd2cqKY1CC09DetV8N9tUmXWqFv104ALYgS2MY1bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706612906; a=rsa-sha256; cv=none; b=ljLeZ63f647utdBZksUUAEXp9ezVJoB+/OcxIPuvBps+L9chPAXxDHk7oyirhBxImeaTt4 QlXd62vzoTm3nNwFrvOcMwQCy33w5GclncniZ8pWI3T+iybV63/pfznCclYw1MgPSZER1U eRxXvAnhrZ9tUl9GxAm7INNRYSDi19Ka5w51HSMwEmK6SgBfUKqaX3rPZazwV+3Nj9odb4 ZguuPamaggls60I8HwTVqVa+8OvFGBmh333+69inZ6bP0P/vk4SPBFxZDRQUml1Wpgi5c8 EaBJHZrIHM4xTnN+177LTSKho7hG0kObyIaEK9scVspoeFdZ5hrdUVaCO3tCOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPMpy3ny1zYHX; Tue, 30 Jan 2024 11:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40UB8Q7k075935; Tue, 30 Jan 2024 11:08:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UB8QvT075932; Tue, 30 Jan 2024 11:08:26 GMT (envelope-from git) Date: Tue, 30 Jan 2024 11:08:26 GMT Message-Id: <202401301108.40UB8QvT075932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: b70d135ab471 - stable/14 - snd_uaudio: prefix module declaration with "snd_" 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/stable/14 X-Git-Reftype: branch X-Git-Commit: b70d135ab4718892568bd6261febdeb22d480aef Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b70d135ab4718892568bd6261febdeb22d480aef commit b70d135ab4718892568bd6261febdeb22d480aef Author: Christos Margiolis AuthorDate: 2024-01-16 16:48:49 +0000 Commit: Christos Margiolis CommitDate: 2024-01-30 11:07:29 +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 (cherry picked from commit 06a4376346e55d1c7aefe7a48063dddc4d1da9b9) --- 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);