From nobody Fri Apr 25 16:56:42 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 4ZkfBg1xr1z5tmWh; Fri, 25 Apr 2025 16:56:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZkfBf2vM0z3T5W; Fri, 25 Apr 2025 16:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745600202; 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=ACkupIiiQqU5ERuVVOiBYT9pdLCzwZnjinMsj0804aI=; b=wm5OpkPFYK+M41g8EsVlmeMRhLLJwFRDOKZtJ8UYhVNFRNYBEteCRaXhVtkS0IOZvorOHM NUu0f0bEW/lSXlEoDes/eLALsT6Yr0gjnpy8aI5DCxVVvQ0rmWKRFr9wCkJig8XRn7tP+A O/c31avdciYhTRypOLlmG6d7xZJYKk4xiAvkySPIt4trNUqUwMu4hyvBzDhnwhoUGvSU2r LKbq76XuA/t0OxevkFJpeHgxbXQmmEDdgSRk3e4D0qiJYYnKYcSRxA36/Wlqp+AO2zC/0Y D/mZTdWiHcEQpG3u6vEBRRZD05pyY3yhEvPkU0lLVOEDIDri53igbozHq5701g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745600202; a=rsa-sha256; cv=none; b=QpVVTO1xSGPcp20f2p0qDJRuiUcJRO6+f2ClfkZQymtR9nvYkEH2VBH0/KpMyXK2/HzKGK 3dgcCePupeHN/0wGUiUgBoWr1SmcZ4B3LutxQ3prykHP63kSzeyh9yFUyXGAp3bW5pz5t6 eAif07x6WWIJ4TI+JVOL8Uxrzk1wNF/t1mXg5ldWmi8MDhh6xuNTrs4lKCKyPQhgX+ueEP TOVcYVTcQGjE1tYMxDGbise2jX6gnlEjBZpff7vukw9wLpryF7nvUdXrPNkQQ5/zuCddSd QsSZGUfjvGNX8D7G7VU14aaFS+sUxrMu1uVatz8y/KkkiEgXnehFBLCUAfbG2g== 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=1745600202; 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=ACkupIiiQqU5ERuVVOiBYT9pdLCzwZnjinMsj0804aI=; b=cZKtraQX+tJUdzA2eLqcS6TUmL9AHIIy0X5aQXKlfxeoCNA7g63fistRU/Ocp9sbF0Vc1z RKJL9I/ev3htO1I7GF/GloXoxIvJl2VlRERgxd8KSjUsfn8ZOTrQlf6pi9rFuYTlXsKgXQ ZTy0PT+l19/z2OdFg2N4+SMCwVk1FmNzAorCVili4diHOXdnm8WiE3Mci1hQWsVP2X+0EB 0ezYh0bmLNPkv7HGPtW5/Bcnwj+Ix/UPXWWLdhteh6Sly0h0p6G/83afb4CIYjtqp14VGU fq4DFLVfgVjKtvO6E22/xulpdWpxg73ZPabTg2c1izZnzUkD6I+o0MP3aM4fGw== 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 4ZkfBf2VflzkpL; Fri, 25 Apr 2025 16:56:42 +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 53PGug3L034786; Fri, 25 Apr 2025 16:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53PGugpb034783; Fri, 25 Apr 2025 16:56:42 GMT (envelope-from git) Date: Fri, 25 Apr 2025 16:56:42 GMT Message-Id: <202504251656.53PGugpb034783@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: facccfc8c7e1 - main - sound: Access softc through si_drv1 in dsp cdev methods 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: facccfc8c7e1463c3139a74d746b715c4f3a02a0 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=facccfc8c7e1463c3139a74d746b715c4f3a02a0 commit facccfc8c7e1463c3139a74d746b715c4f3a02a0 Author: Christos Margiolis AuthorDate: 2025-04-25 16:55:58 +0000 Commit: Christos Margiolis CommitDate: 2025-04-25 16:56:14 +0000 sound: Access softc through si_drv1 in dsp cdev methods No functional change. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D49804 --- sys/dev/sound/pcm/dsp.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 9b174f4592f3..bc64b50b4510 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -455,7 +455,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) } static __inline int -dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) +dsp_io_ops(struct cdev *i_dev, struct uio *buf, struct dsp_cdevpriv *priv) { struct snddev_info *d; struct pcm_channel **ch; @@ -467,7 +467,7 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) (buf->uio_rw == UIO_READ || buf->uio_rw == UIO_WRITE), ("%s(): io train wreck!", __func__)); - d = priv->sc; + d = i_dev->si_drv1; if (!DSP_REGISTERED(d)) return (EBADF); @@ -536,7 +536,7 @@ dsp_read(struct cdev *i_dev, struct uio *buf, int flag) if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); - return (dsp_io_ops(priv, buf)); + return (dsp_io_ops(i_dev, buf, priv)); } static int @@ -547,18 +547,16 @@ dsp_write(struct cdev *i_dev, struct uio *buf, int flag) if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); - return (dsp_io_ops(priv, buf)); + return (dsp_io_ops(i_dev, buf, priv)); } static int -dsp_ioctl_channel(struct dsp_cdevpriv *priv, struct pcm_channel *volch, - u_long cmd, caddr_t arg) +dsp_ioctl_channel(struct snddev_info *d, struct dsp_cdevpriv *priv, + struct pcm_channel *volch, u_long cmd, caddr_t arg) { - struct snddev_info *d; struct pcm_channel *rdch, *wrch; int j, left, right, center, mute; - d = priv->sc; if (!PCM_REGISTERED(d) || !(pcm_getflags(d->dev) & SD_F_VPC)) return (-1); @@ -686,7 +684,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); - d = priv->sc; + d = i_dev->si_drv1; if (!DSP_REGISTERED(d)) return (EBADF); @@ -703,7 +701,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, PCM_GIANT_EXIT(d); return (0); } - ret = dsp_ioctl_channel(priv, priv->volch, cmd, arg); + ret = dsp_ioctl_channel(d, priv, priv->volch, cmd, arg); if (ret != -1) { PCM_GIANT_EXIT(d); return (ret); @@ -1460,7 +1458,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, chn = wrch; } - ret = dsp_ioctl_channel(priv, chn, xcmd, arg); + ret = dsp_ioctl_channel(d, priv, chn, xcmd, arg); if (ret != -1) { PCM_GIANT_EXIT(d); return (ret); @@ -1783,7 +1781,7 @@ dsp_poll(struct cdev *i_dev, int events, struct thread *td) if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); - d = priv->sc; + d = i_dev->si_drv1; if (!DSP_REGISTERED(d)) { /* XXX many clients don't understand POLLNVAL */ return (events & (POLLHUP | POLLPRI | POLLIN | @@ -1865,7 +1863,7 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); - d = priv->sc; + d = i_dev->si_drv1; if (!DSP_REGISTERED(d)) return (EINVAL);