From nobody Thu Nov 13 14:36:05 2025 X-Original-To: dev-commits-src-main@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 4d6jW96c0mz6Gxvt; Thu, 13 Nov 2025 14:36:05 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6jW95ydVz3M4F; Thu, 13 Nov 2025 14:36:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763044565; 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=BQYAu3MFJzEWhaPJRktfVyjNQ7ZZVWCNXmiM0uYxRwE=; b=wbYev/dGf7kud6raMtjEaWEQq4QWdbD0SVaeP0oQK/GF0y+mSjyObS07UlEhcqxhE1wSvm HihjPkE2KNKlMl+FIKXO23FUYjcwX8/MXlQAQ7Y/Gf/qhLk2amZovkvBHfQhvelPOdbrzB L6d9UnBqJYEyCBdq+1lg6q8zAPi69chmNyDz1uiIhXQOChYbmtfA/6z02Qiw1E05lfm0ao QocxlClsiSG3C5lMkm+drjLbppmHWuW2+7Z8Gr6M5zE+nH2pnAWEuPWXiVy2xOMNTO0g0Y r7XVSjlSHLJGq0c6Wviv4r6ksHBp+NBTWXCnHzJsplay+MP1XhGa3CQBQ0cNDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763044565; 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=BQYAu3MFJzEWhaPJRktfVyjNQ7ZZVWCNXmiM0uYxRwE=; b=UsOPgBHSmyuyV4yzyq5wf5w71HQs0PpXu5Y0isLa/j2hT2dSwOA72tGApvOYrHPEPtRxvm JVzDQvHXvriKhI0H423QxrTaSmYlDKlfyx+8WtvHzDrMhX6ic5eMM+QIUfemlLjjcteqNQ AVINzmpIA7N0l42L4eFgd9+U0q+MBD9qF54dWL8ZOFfBLdTSMWpz/BXC3DFy6I7Mxv7DgJ tOp2rswPbyFt0IYZbBLjCkhVg5dnlOUZTtdxSSagwcBZHw1idtcgutCIxFVvflQsLCav2E rYuyex7YN0n/5dWF9sAfWPNqL+iDfVKwQwvm/a3vfp1WaRClzg3Zox0P3xyK4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763044565; a=rsa-sha256; cv=none; b=UxLhLGoS79IK95u54+mih5Cns+UUmLoAI+IZvkrcB/mA/8vcVk8udqSfTiqWlczkBonSao 4Pc6eN/wvGLsvPNZioTM61MTv+ldSLf0MlcwIJpDvr76b9PZNdanzePN+cTpGsIQKreVfV mjpB4KtvoWbLil9oQLpDU3wM/vzuuvsCYx5cKfI7UBoL0Re/WVT4h2q006V3A6qdBEBD1P BNmp9+XPV3wmM2ygW/3ffGPeLkKfjJb9vkGc9WiXhA31WAuNDd7aXIVnmtBPWtLnB2OLR5 a8vpy2wWht0LjPipMmf1aBVLFuAznuKC/vCgLFznZ3s1zgLqNhuapZQ59KlzNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d6jW95RfGz97p; Thu, 13 Nov 2025 14:36:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5ADEa5h9045724; Thu, 13 Nov 2025 14:36:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ADEa5RN045721; Thu, 13 Nov 2025 14:36:05 GMT (envelope-from git) Date: Thu, 13 Nov 2025 14:36:05 GMT Message-Id: <202511131436.5ADEa5RN045721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: fa7bc9830766 - main - sound: Do not use double pointer in dsp_io_ops() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fa7bc983076661e85107970e39de66a1e54d87d1 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=fa7bc983076661e85107970e39de66a1e54d87d1 commit fa7bc983076661e85107970e39de66a1e54d87d1 Author: Christos Margiolis AuthorDate: 2025-11-13 14:35:53 +0000 Commit: Christos Margiolis CommitDate: 2025-11-13 14:35:53 +0000 sound: Do not use double pointer in dsp_io_ops() No reason to do so. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D53734 --- sys/dev/sound/pcm/dsp.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index f7188fd16356..1ae090f252c2 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -462,7 +462,7 @@ static __inline int dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) { struct snddev_info *d; - struct pcm_channel **ch; + struct pcm_channel *ch; int (*chn_io)(struct pcm_channel *, struct uio *); int prio, ret; pid_t runpid; @@ -476,12 +476,12 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) switch (buf->uio_rw) { case UIO_READ: prio = FREAD; - ch = &priv->rdch; + ch = priv->rdch; chn_io = chn_read; break; case UIO_WRITE: prio = FWRITE; - ch = &priv->wrch; + ch = priv->wrch; chn_io = chn_write; break; } @@ -490,21 +490,21 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) dsp_lock_chans(priv, prio); - if (*ch == NULL || !((*ch)->flags & CHN_F_BUSY)) { + if (ch == NULL || !(ch->flags & CHN_F_BUSY)) { if (priv->rdch != NULL || priv->wrch != NULL) dsp_unlock_chans(priv, prio); PCM_GIANT_EXIT(d); return (EBADF); } - if (((*ch)->flags & (CHN_F_MMAP | CHN_F_DEAD)) || - (((*ch)->flags & CHN_F_RUNNING) && (*ch)->pid != runpid)) { + if (ch->flags & (CHN_F_MMAP | CHN_F_DEAD) || + (ch->flags & CHN_F_RUNNING && ch->pid != runpid)) { dsp_unlock_chans(priv, prio); PCM_GIANT_EXIT(d); return (EINVAL); - } else if (!((*ch)->flags & CHN_F_RUNNING)) { - (*ch)->flags |= CHN_F_RUNNING; - (*ch)->pid = runpid; + } else if (!(ch->flags & CHN_F_RUNNING)) { + ch->flags |= CHN_F_RUNNING; + ch->pid = runpid; } /* @@ -512,11 +512,11 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) * from/to userland, so up the "in progress" counter to make sure * someone else doesn't come along and muss up the buffer. */ - ++(*ch)->inprog; - ret = chn_io(*ch, buf); - --(*ch)->inprog; + ch->inprog++; + ret = chn_io(ch, buf); + ch->inprog--; - CHN_BROADCAST(&(*ch)->cv); + CHN_BROADCAST(&ch->cv); dsp_unlock_chans(priv, prio);