From nobody Thu Nov 20 13:31:42 2025 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 4dBzlf6L3Sz6HP0X for ; Thu, 20 Nov 2025 13:31:42 +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 4dBzlf4vQvz44GJ for ; Thu, 20 Nov 2025 13:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645502; 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=EZXlrRGnYhGx29RyCC1+JXGq6bikea5llOtAxRozB5k=; b=CK1hj+BNwph16vIRwzCSgTA/HKJqLdPub6F/4K7B7650Wi0C3emww5IvqD2X91q6f/s7Vw fRRz3Li/tDTTcuSqOPiOM0WqW1eze6YssOTHPw5+rhtbu+M7kKmIfoi9vjQ9liIb4FLQO2 VyomVazb9Azd4JkZzrkb6UPA9xFvNSNMhgtEa8dhzyzsR2WGruPbfzM/EabM2JbZAGch4m tqDsoGc4RIpyxALsY1akOvWZSX1ZwzCW0FRrGZ1RC5lCfW2wgc9OWMb4yMRB3lAOw3/s2G 1ds2PKNb7T45GdksmboNjyEdSWB/+FrLPpqiXD9cjUCC5Z9Se8d9o9X1dWHIVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645502; 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=EZXlrRGnYhGx29RyCC1+JXGq6bikea5llOtAxRozB5k=; b=vWiLC9Rwlwh26xfYFyVHVOdzzLy1zRoCZrYLOiYqnI/mvlVAw+EFY04h2iklCTIwEIGAmS S8tDzn+Npwop7U/1fmq08LSw/EwL/lHNTsvQVNNxWk5cHSUGnodas78/U25Oy8L3tQceM5 gxQd1gbRycswHohmUnzB6JqicIe5HhgCpBQShW3LDOHINPWUltFEhJc2gmOSYYD6yKmDfp 2ePFoJfv7IlMgxQDbOHFG7spuLaRGqi+uRIBXk58pw/Cda0dzs4NApxK1hZXbRAb8PesQN ZcVVuon5Zsxdo+CyuOxBeZq5CaX2xJn65ChFQcc2wrMdMuvDqiQE1GXW88ORzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645502; a=rsa-sha256; cv=none; b=bhHu8oBvEarW0WpMZhRsV7BkrjlhWjDtVf0Q2XvyGHOaPGW6PZcZmV29wGEn2GG/YnE8rN 5xyoRzyE7/UOwqY6vzGnX4XySrfHFpF9eC7wKXGv6Ml42muD/T9+KTXfH7jIUyHHEBq+vO xKQ1z6Wn4UIrNXol8Zig14q0h83xPJD6WKem3nIEDxB0VKDINERqCxWZwREzfr8JeTHGx2 xHxfTDCYB1bv0XhvF7GzKxKE5wddif3kwO8Qd4GU7GFQfJW+vpAvcq44MlIYcOs7yZ6ga6 a3HUpizNvmPXmNlVl5kiRSiprcNiiQeUZdsjcxm1C5IJx0zEsg3g2sdHte8zhw== 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 4dBzlf4BcrzCcs for ; Thu, 20 Nov 2025 13:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2af46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 3c1061a33db7 - stable/15 - sound: Retire OLDPCM_IOCTL 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 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: 3c1061a33db7c64365a2c31a8d37423ead4c0452 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:42 +0000 Message-Id: <691f183e.2af46.2ad4cb62@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3c1061a33db7c64365a2c31a8d37423ead4c0452 commit 3c1061a33db7c64365a2c31a8d37423ead4c0452 Author: Christos Margiolis AuthorDate: 2025-11-13 13:33:28 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 sound: Retire OLDPCM_IOCTL It is defined by default, and there is no reason to have a switch for it. While here, also get rid of some unnecessary comments and ioctl definitions. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 1fe7bfd6c70160c064237eac104e7d9c71390c4f) --- sys/dev/sound/pcm/dsp.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index d0ed405fb25b..429586e64aef 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -72,8 +72,6 @@ SYSCTL_INT(_hw_snd, OID_AUTO, basename_clone, CTLFLAG_RWTUN, #define DSP_F_READ(x) ((x) & FREAD) #define DSP_F_WRITE(x) ((x) & FWRITE) -#define OLDPCM_IOCTL - static d_open_t dsp_open; static d_read_t dsp_read; static d_write_t dsp_write; @@ -808,10 +806,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, } switch(cmd) { -#ifdef OLDPCM_IOCTL - /* - * we start with the new ioctl interface. - */ case AIONWRITE: /* how many bytes can write ? */ if (wrch) { CHN_LOCK(wrch); @@ -1028,10 +1022,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, printf("AIOSYNC chan 0x%03lx pos %lu unimplemented\n", ((snd_sync_parm *)arg)->chan, ((snd_sync_parm *)arg)->pos); break; -#endif - /* - * here follow the standard ioctls (filio.h etc.) - */ case FIONREAD: /* get # bytes to read */ if (rdch) { CHN_LOCK(rdch); @@ -1070,11 +1060,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, } break; - /* - * Finally, here is the linux-compatible ioctl interface - */ -#define THE_REAL_SNDCTL_DSP_GETBLKSIZE _IOWR('P', 4, int) - case THE_REAL_SNDCTL_DSP_GETBLKSIZE: case SNDCTL_DSP_GETBLKSIZE: chn = wrch ? wrch : rdch; if (chn) {