From nobody Wed Jun 3 08:23:26 2026 X-Original-To: dev-commits-src-branches@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 4gVggy2HlDz6gJx2 for ; Wed, 03 Jun 2026 08:23:26 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gVggy0vw9z3gBy for ; Wed, 03 Jun 2026 08:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780475006; 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=tUBq6ZB9H0IEu8MNmRsslHSwH60aRq31PVO6QXDZtuY=; b=mySUfoainnqS29WruteMSV8olAVyjr7kxbk/nwF/Bcl+uFEkRFl+wLKVIxIY+Mn7NAcsJT /l3hsM0y+qRZyevuNUhSZ/eLBfMowAiTrUTrPqlKhY6qKgPlBkCl26zl8vz6edExY77PZn n5cKHsnwVZUBf0o7MIrtxOiEqc1ruhq1u4znb+H5rKb7A9XiDbyphLa+tDxq90zrxUMqZs JR1Vm3/U/x0kRqD5dGZiPnZFrcxQTdtaGnGZ9lXDVgTqUaicosQZCq48KxHsdcFYsDANM4 oJGuiwAE+FXB1BL1sU/aEsmZraiofXA35vwhnuD1PIjJnasynemF94wCy96/CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780475006; a=rsa-sha256; cv=none; b=Rp4Y0pvW/2IHURIJuMpn1fxXH+6xgvPKUJDegNVrOxIQWyTGrYeqzgm9W+c/z+8B9H127C oaZjfrcWcH4L0o69NYx+HhYzaK+vK6glT1QyRCDj/l5FHdM2WYYrLIIcYZj0bv7RzYuf89 xyHX+DpDrSxftQg4oD1/u1fsx4/cD0vpeFvQ/k+cHXePv9w6lATstawN6SJfnYmMmZDbbU CoGyvFfu/qhGTnTK/Mo+B0xt+qOOQ6vvS9Y6G9AHMYaJS/Gy5Pk73fAv3JO3NLlpQmTSko MR+TZzOsSbfrNlOwGvNIZbXMOijVHIqn8CVv/5cHfm0rc6sDGzzE9kILWMy0dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780475006; 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=tUBq6ZB9H0IEu8MNmRsslHSwH60aRq31PVO6QXDZtuY=; b=MFaiulDwBrXEu2gAwq1liL//XSS48iCj9TEC9CvBgQFkhyAR3UzqtEb4UD4bEY+CTLLCVV LkD2Guve/w3FYIxnLGEiWTnoMxkQ41Cg9xXHtScn2vOKBcjvxggat/2jRFSKc8fiKkdHyA mXK1+wHDilgPFw2Z3aVeNMJde1m72cbA3EMOTAAKhSYceS7K8Gv2R/QzL8hPeb8R58MNxC TKAvPlB3jFnKb5vjw6y7EBvoiOXuL50FII9g6YAyljdGzx49WVGsnyTys4H6BWsh3NFosq WIhqOIieWezm5gqfTOJQneJ4ZPBMz7BqASITs4YnvCLcXYq6E9USV+AI9ABoTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gVggy0J6tz13rZ for ; Wed, 03 Jun 2026 08:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e76 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Jun 2026 08:23:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: de5502ed01c8 - stable/15 - sound: Remove unused "from" mixer_ioctl_cmd() argument List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: de5502ed01c805320841a25643c1dd8958306d88 Auto-Submitted: auto-generated Date: Wed, 03 Jun 2026 08:23:26 +0000 Message-Id: <6a1fe47e.38e76.6adf6778@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=de5502ed01c805320841a25643c1dd8958306d88 commit de5502ed01c805320841a25643c1dd8958306d88 Author: Christos Margiolis AuthorDate: 2026-04-16 11:32:03 +0000 Commit: Christos Margiolis CommitDate: 2026-06-03 08:22:24 +0000 sound: Remove unused "from" mixer_ioctl_cmd() argument Sponsored by: The FreeBSD Foundation MFC after: 1 week Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/18 (cherry picked from commit 22730c4b10ba391859a06966ea3e429aaf43cd09) --- sys/dev/sound/pcm/dsp.c | 9 +++------ sys/dev/sound/pcm/mixer.c | 4 ++-- sys/dev/sound/pcm/mixer.h | 5 +---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 82c960fc3b40..8a2ce2422bef 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -728,8 +728,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, if (d->mixer_dev != NULL) { PCM_ACQUIRE_QUICK(d); - ret = mixer_ioctl_cmd(d->mixer_dev, cmd, arg, -1, td, - MIXER_CMD_DIRECT); + ret = mixer_ioctl_cmd(d->mixer_dev, cmd, arg, -1, td); PCM_RELEASE_QUICK(d); } else ret = EBADF; @@ -1526,8 +1525,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, if (d->mixer_dev != NULL) { PCM_ACQUIRE_QUICK(d); - ret = mixer_ioctl_cmd(d->mixer_dev, xcmd, arg, -1, td, - MIXER_CMD_DIRECT); + ret = mixer_ioctl_cmd(d->mixer_dev, xcmd, arg, -1, td); PCM_RELEASE_QUICK(d); } else ret = ENOTSUP; @@ -1539,8 +1537,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, case SNDCTL_DSP_SET_RECSRC: if (d->mixer_dev != NULL) { PCM_ACQUIRE_QUICK(d); - ret = mixer_ioctl_cmd(d->mixer_dev, cmd, arg, -1, td, - MIXER_CMD_DIRECT); + ret = mixer_ioctl_cmd(d->mixer_dev, cmd, arg, -1, td); PCM_RELEASE_QUICK(d); } else ret = ENOTSUP; diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index d73361fe7e16..73d1b5870b83 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1044,7 +1044,7 @@ mixer_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, PCM_GIANT_ENTER(d); PCM_ACQUIRE_QUICK(d); - ret = mixer_ioctl_cmd(i_dev, cmd, arg, mode, td, MIXER_CMD_CDEV); + ret = mixer_ioctl_cmd(i_dev, cmd, arg, mode, td); PCM_RELEASE_QUICK(d); PCM_GIANT_LEAVE(d); @@ -1067,7 +1067,7 @@ mixer_mixerinfo(struct snd_mixer *m, mixer_info *mi) */ int mixer_ioctl_cmd(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, - struct thread *td, int from) + struct thread *td) { struct snd_mixer *m; int ret = EINVAL, *arg_i = (int *)arg; diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h index 3ce8a4f5adee..4ced76082e31 100644 --- a/sys/dev/sound/pcm/mixer.h +++ b/sys/dev/sound/pcm/mixer.h @@ -36,7 +36,7 @@ int mixer_delete(struct snd_mixer *m); int mixer_init(device_t dev, kobj_class_t cls, void *devinfo); int mixer_uninit(device_t dev); int mixer_reinit(device_t dev); -int mixer_ioctl_cmd(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td, int from); +int mixer_ioctl_cmd(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td); int mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi); int mixer_hwvol_init(device_t dev); @@ -63,9 +63,6 @@ u_int32_t mix_getparent(struct snd_mixer *m, u_int32_t dev); void *mix_getdevinfo(struct snd_mixer *m); struct mtx *mixer_get_lock(struct snd_mixer *m); -#define MIXER_CMD_DIRECT 0 /* send command within driver */ -#define MIXER_CMD_CDEV 1 /* send command from cdev/ioctl */ - #define MIXER_TYPE_PRIMARY 0 /* mixer_init() */ #define MIXER_TYPE_SECONDARY 1 /* mixer_create() */