From nobody Thu Nov 13 13:33:38 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 4d6h764jt6z6GsT2; Thu, 13 Nov 2025 13:33:38 +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 4d6h762y51z49vn; Thu, 13 Nov 2025 13:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763040818; 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=T+edotYIPSREPq920BDTRzLs+gEHvux+FSBgTR+XzjA=; b=JwJ61oJQiVK9p6b+M6fhonoBTTuOTKwM6aFAEwRcWxzW6MKfvJnO1ZcBIgQGspw7uSOocG qnbD+TT/qEvbRtVB9xTmrbweCQ9OpHXrYzdzzSa/UjqM1LBlLSWOQrCUlVZtJ9RNv/hSMN 6ZmCSPwnbB5ub2li3bCAMd45o0b52Qil2EBNyCBMk19UqKeNfvohHQTZO/7ryJYLzYxBue hby92nm8Lmtr7O65vGwnH+Q6Q4zlyOQhUcnScvPo8osS6oEONKd1qRL9miKBFiJIfUKwNG n6VNLxjzqC9U68qDtBLrWv18qQdg6Dmq/Z9gDuS5RxJvPboe+mIurXKTj+z1Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763040818; 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=T+edotYIPSREPq920BDTRzLs+gEHvux+FSBgTR+XzjA=; b=diV6M1ZaLYnJtmbL0doMWTA8Cne+jI6CuHL8tuKhE7fbp0vAk+ci/pXLkggcvE5CF56kgH tsHY1m2ZoobQLePaWfZNgbf0X9VQpMuD6pCnDnXnyER49LHc6YJLoIiGScnSDDu2OxRj/6 kv485epkRxz98/rBUMBBEMJeEaS4VUuEMapYgU5yI9FPcdTh7BT8ruNXn5ZaZlxg20BtYx eJm4PJZG/Y0V031Kudfzk+IbqREsMLpE44Vbh6HSbIHW3VblGzP0JSak1KdWdWYHQYI0aj U4ThV/cIpuIRucP934JOAtdRiM/FitkotiXncgkuKOW28OuXH4FXTpR5myc4/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763040818; a=rsa-sha256; cv=none; b=P2iIhrIeZry3mUa1ltlnhRmRCAlaASHSTBxVHkYHxPxwuDG16y6z+jr3ACAgksVEmuZMel nBWE4coax0LMLAji/27si/VUsaYejOADq1fNUe+OgArfut2ZT0LuHiXOBhl6qG7NA+WmTa opkLt94EsJzSULHolFMV49vaa/l7LtGHHPo5fJ97XbyrbUMogAWZ5cBeKYGd0OzNM8xnYe HdYdD690YFT1PBjq1rpYZRV6TqU0atJYxMBlAHkAXP9NEGHkLiNdagXnHS0gVhEoAtokvN 7dGPYSit80GZs6lnT4MxlC8YowlB4GjiJQB/qb6OC9gtcMReSKSyFHJFIjJH+A== 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 4d6h762T5Qz7Gt; Thu, 13 Nov 2025 13:33:38 +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 5ADDXcPF031950; Thu, 13 Nov 2025 13:33:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ADDXc0F031947; Thu, 13 Nov 2025 13:33:38 GMT (envelope-from git) Date: Thu, 13 Nov 2025 13:33:38 GMT Message-Id: <202511131333.5ADDXc0F031947@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: 1fe7bfd6c701 - main - sound: Retire OLDPCM_IOCTL 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: 1fe7bfd6c70160c064237eac104e7d9c71390c4f Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=1fe7bfd6c70160c064237eac104e7d9c71390c4f commit 1fe7bfd6c70160c064237eac104e7d9c71390c4f Author: Christos Margiolis AuthorDate: 2025-11-13 13:33:28 +0000 Commit: Christos Margiolis CommitDate: 2025-11-13 13:33:28 +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 --- 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) {