From nobody Fri Sep 18 18:18:44 2026 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 4hmgqT06ZYz6sp8v for ; Fri, 18 Sep 2026 18:18:45 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hmgqS51scz4Nk0 for ; Fri, 18 Sep 2026 18:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789755524; 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=Q3/wLvlDzOslsoghp5HoINRdv9LhqS/NDc5+Od0eZuo=; b=jqtLy1/J48Y7mrgTMLdlNUt0yE2rDADpN7lJg+3Jlor0XNQUUgr1IxqFSnEnekal76Z+Jt 1DoTX6gociXKb950l/vQGei2VXN3myLk4cn4fDhVyHjXd7hseFa88QSw/X6hD6+dAz4nO6 wxgrPXFd/Uhd/il1/RWUW5loXeWItKAGUstmU6T0fa3lJqJ5Wvx6n0e9irZwAK0lsqYpiJ rW0c3fQWuuT0rN1ZhQsNrYgi8vKZxpFaSehrffXFyiKfOcV2dTC3ETloMN8tEHj7l+L0OV xPW5oWd04vQT/qOAIvsy87dhhivqAwZB5SkMOSWJi3w905neYmcTXGwVcPsTJQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789755524; b=X+/qsq3rB6oKmDWk4LChs/hMrVejmnKkwM+GMsYfj5muGFnZJD2J9NPLLYvtNUIze6yCI/ pkLfDqz95Jp5CLGB5+Az4hmS13coMsdWstcFz/Vm9Ut0ZPlcHNFRcY+2mMCZ0oMb+3YW1e k3h7KrKgOnPNRara3kl/TUmV64fpCbqNl9YHc8vqAahakdVFeYMQXtxsSvzqx2XWWBH9LE UOSgwWzj/tJTVHTAQme2EPsClq8RkHscyi2vVStxeycTxEo/sGx7OI/SEE9C5YBts+xGOo sh59R+SbAK3itc27R1Vs4cNoQAGKLh0mHaLUCNewRm3hLRKRSEMGlLQU87Mitw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789755524; 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=Q3/wLvlDzOslsoghp5HoINRdv9LhqS/NDc5+Od0eZuo=; b=IgVGvOHYTFjhuspSnmGOJpefEf6D7UKBeeXam9Sceo/uPImREYy5n6NhsyJgpcvmid6ip2 47kVdR3gf7htrQC9TWT5+OWWqN8coDP5OcbomjQLzhwIZGvuYk6V4dx96BKT3nqohRb6rN ZVogK/3n+ltJf+TJW5tjuIR5UjSg/5wkocEiYP8rd2Ed3g/I+4kl026ShibigsfjWiXxW2 5PupdSkjdesA/bOnh75l4m4ugSK6gHpqVe/4VzmVXYOxo58sV+mL2+cUvk0nFTtKgBipeM KkAA8mfqvD/8ZjkAj+OQhbiqgJcazaD0dHzkiAXGCYZ0JkMzpjHwKGlmTs2rdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hmgqS2SnSzTFf for ; Fri, 18 Sep 2026 18:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 346d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 18:18:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 6c735475aeef - main - sound: Reuse mixer_delete() in mixer_uninit() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 6c735475aeefc626962818c0ab8749aaeb6de9a4 Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 18:18:44 +0000 Message-Id: <6aad8084.346d3.37ab04dd@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=6c735475aeefc626962818c0ab8749aaeb6de9a4 commit 6c735475aeefc626962818c0ab8749aaeb6de9a4 Author: Christos Margiolis AuthorDate: 2026-09-18 18:18:01 +0000 Commit: Christos Margiolis CommitDate: 2026-09-18 18:18:01 +0000 sound: Reuse mixer_delete() in mixer_uninit() Sponsored by: The FreeBSD Foundation MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D59077 --- sys/dev/sound/pcm/mixer.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index c0d05b5d195d..19bb28cbb939 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -519,8 +519,6 @@ int mixer_delete(struct snd_mixer *m) { KASSERT(m != NULL, ("NULL snd_mixer")); - KASSERT(m->type == MIXER_TYPE_SECONDARY, - ("%s(): illegal mixer type=%d", __func__, m->type)); /* mixer uninit can sleep --hps */ @@ -633,11 +631,7 @@ mixer_uninit(device_t dev) /* mixer uninit can sleep --hps */ - MIXER_UNINIT(m); - - if (m->type == MIXER_TYPE_SECONDARY) - mtx_destroy(m->lock); - kobj_delete((kobj_t)m, M_DEVBUF); + mixer_delete(m); return 0; }