From nobody Thu Nov 20 13:31:44 2025 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 4dBzlj1J0sz6HP35 for ; Thu, 20 Nov 2025 13:31: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlh6Cftz44bC for ; Thu, 20 Nov 2025 13:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645504; 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=A1NKu/ZiZe4LdKSGMVfDn43/mkmNBwlMGpj4hIrxrng=; b=DBCYhViS/oJCRmJIO6dWUNFaxoyKxmXzB7woIfeFu2ySnQD1KRfnAPGZSjn+HoOj5UQZtF NzZhdUDYIxmKaX8ktf15/R+EQ2TeWwN6G9y22TyeZzU48Ee40DCeeY5n1+d5BHWzMCDYmU OQ/cpWz1HB0V4SY9J+jOFNSkFm2yXRU+Sdh0OhDkS5m8mTOugjMctXZmwC6WS4bUbg2KDx +x4OBDA4q0nyWtJtFwnxzzb9S5X7RXWY2BRxo+CIYd1rYTYhR4sghYN3uGZSvsY3AeDxPh MM7iyWtOtBzNjXUBEpk3jZJTlgWLTyq70ns4fRNnyqt4pgNcD2tNPAFyNtYxhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645504; 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=A1NKu/ZiZe4LdKSGMVfDn43/mkmNBwlMGpj4hIrxrng=; b=cZ+zBLJeyGzsEbajnmzWiNofv6q0XmexzPuC4k+wNcXoxQTZCOBAHAKxz2mhY7ULeT73pa mcMvWBASqenJ5/keKtzLMBVM4cv2pSc+GBgcVmb45M1kH0mzfVYdybUpsH1VhWAP4GofPd Ol5zpeXriB/OiW5bBfJpreqpovJiZarf+MyZS7CSXnfbSZ9yrRaEdHy3KIr+p4JcgdP/YW 9MW0RO/IVPwdWDG1td1X05ZxLAj2kydWZFhBBmoGuvQ7UyZW9/7uxcMf0UFoup8OmPq2TP A5EzipHS7xnrxWl6PRwBEmLLpkwl/kkWKGKZbq+/7qrC+IpdqJUSzyPpdb8wAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645504; a=rsa-sha256; cv=none; b=HYXC8b0U+evNT3NcBo/qTBScvBYVtjckpJs/2CZNhI2A8dEwwLGWwFSZBKX/lpU3BgFpR+ 75vHq7wn5qYKiNMyfjD48I/m3TDZl2ycyiNpKZuxO+7fgINRKQyoVHnP8jjT3Y1kmrAMIL duT+CELd0nQgCcea20UHomk2r0vs3k1xI2vTGZu8+Y9EHSo4Hbun01FgJeDwsKPy8M9Hfn RiHZYKdXoocTKEQk/uegubwMdAfgT3Ju2Ey9VyWPb/CTRZJm3cAj7Ed0Par5b9jZjaT3gJ oq49pKzn/zjrP2HYJp9xEbqvdhIgtx/AnC2BEFE/n2pUiF1uXhaPQnP0In2cyw== 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 4dBzlh5pZPzCN3 for ; Thu, 20 Nov 2025 13:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2d082 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 47bdb815f31d - stable/15 - sound: Do not use double pointer in dsp_io_ops() 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 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: 47bdb815f31dc9b584700ed988a729e3f239378a Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:44 +0000 Message-Id: <691f1840.2d082.2a20e63@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=47bdb815f31dc9b584700ed988a729e3f239378a commit 47bdb815f31dc9b584700ed988a729e3f239378a Author: Christos Margiolis AuthorDate: 2025-11-13 14:35:53 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:15 +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 (cherry picked from commit fa7bc983076661e85107970e39de66a1e54d87d1) --- 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);