From nobody Thu Apr 18 20:35:52 2024 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 4VL8gD2LPCz5HX85; Thu, 18 Apr 2024 20:35:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VL8gD1RJCz4N69; Thu, 18 Apr 2024 20:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472552; 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=GCVOZIQrRfMXwi/E2ullAixUIcrj0jUIcPe43zLMrmA=; b=xVFMhkhc0HXfdsj555k1Uqw1lD/iNupDFpjfuOUQ/NO/jSxUebITqycsDKro4dIytANg4o NNLhWFBTcz1hj2T8MZc3Rtsild02jR3pPeKs890rqjEwtVglVX9yo508YwOTKfLon11WQU WI//VM7ubELB60Ah9UF1IK1sSmj0cDIMh9XusDu5XR2n/SJTpl+bdQT1c6qMYDZoTBKwtx VSV3RhDrY4N4eZuxV3o70uyf2kcTw8ivXtNZ29Fv3wrF2w7kb2/TxhSYm3rbNx6IzmKK0d yET58FyxSTsLXdVMo5hGPhPhK0WJXi8H8xNMVwHCC4w3WEWhL3rmjspPl/TFow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713472552; a=rsa-sha256; cv=none; b=ToNrdH20SVJ7aJFmhS2Act4zJy/Y72ZiAosjAnnWhLHMsLaUC6sgV+IOC1DBsGRdfPLC1B UEaxW0nxUcXOQZ4ofxv2p3yC54BuOW1d7S1uEy+tNl7D3s859qTsPKMeFvCbbdHX5sJZok 5v6taDIKmXMUiGbzW6yaS0BWRAx5Xn0XCDjD4CgTQI+4zNZ4dBFVS/N+EBkvCJNJJCL2Yu xEOK+FUU2NGO907a7IpuMXtV5y1aZ7wn+XMK50V8vSk19Sar4JO6Cmk7xgbfckJFwKqhGS +ricPIWdxmaXwZM8NjtAAc8ufml85j5V+930IBT6IO3/Ap2J5bBMUnS0T76kaQ== 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=1713472552; 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=GCVOZIQrRfMXwi/E2ullAixUIcrj0jUIcPe43zLMrmA=; b=aXupRAGU7KjXmyZzDCSnuXmF3we6Ry7TROqjsgRiyQALTLKsQdPJUm5baoZth/HTMSdws6 /QXk2Ud0IFnfPy/BigF4UM3Hmt2iMhKihtmpXiFxgbDuYLJstNMR1bx41Rg+PMz83bXOXE 5pnyE+R67ub3Rt7iCUmM4d3NVeT1o+uGRIia0GOBeQoK7iaw9GrL/Mqqee0RaIKD0EncIB EYpuoXbEstjKkyM+hWOSdsfpNp5b4W8pkKEfnhMoSBkAAeRscVHkmWqSk8aq2rvHab1ZPU WjUY7HN/FtYfIhaNgF+Kw5LstOOCnEMdVNI1VqQq6m6aAYkWwNhkR9Zb5M14xQ== 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 4VL8gD10vTzPXs; Thu, 18 Apr 2024 20:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43IKZqsI056762; Thu, 18 Apr 2024 20:35:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IKZq4H056759; Thu, 18 Apr 2024 20:35:52 GMT (envelope-from git) Date: Thu, 18 Apr 2024 20:35:52 GMT Message-Id: <202404182035.43IKZq4H056759@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: 8b97dce6973c - main - sound: Remove PCMMINOR() 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/main X-Git-Reftype: branch X-Git-Commit: 8b97dce6973ca1b6c3407c34c76d459f43ca1061 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8b97dce6973ca1b6c3407c34c76d459f43ca1061 commit 8b97dce6973ca1b6c3407c34c76d459f43ca1061 Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:15 +0000 Commit: Christos Margiolis CommitDate: 2024-04-18 20:35:41 +0000 sound: Remove PCMMINOR() It's a NO-OP. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44854 --- sys/dev/sound/pci/emu10kx.c | 2 +- sys/dev/sound/pcm/mixer.c | 4 ++-- sys/dev/sound/pcm/sound.h | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c index 6bbbfcc1df0e..d17f5fb16d34 100644 --- a/sys/dev/sound/pci/emu10kx.c +++ b/sys/dev/sound/pci/emu10kx.c @@ -2313,7 +2313,7 @@ emu10kx_dev_init(struct emu_sc_info *sc) mtx_init(&sc->emu10kx_lock, device_get_nameunit(sc->dev), "kxdevlock", 0); unit = device_get_unit(sc->dev); - sc->cdev = make_dev(&emu10kx_cdevsw, PCMMINOR(unit), UID_ROOT, GID_WHEEL, 0640, "emu10kx%d", unit); + sc->cdev = make_dev(&emu10kx_cdevsw, unit, UID_ROOT, GID_WHEEL, 0640, "emu10kx%d", unit); if (sc->cdev != NULL) { sc->cdev->si_drv1 = sc; return (0); diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 9a83fc305bc7..0178e1ae8c3e 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -765,8 +765,8 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) mixer_setrecsrc(m, 0); /* Set default input. */ devunit = snd_mkunit(unit, SND_DEV_CTL, 0); - pdev = make_dev(&mixer_cdevsw, PCMMINOR(devunit), - UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit); + pdev = make_dev(&mixer_cdevsw, devunit, UID_ROOT, GID_WHEEL, 0666, + "mixer%d", unit); pdev->si_drv1 = m; snddev->mixer_dev = pdev; diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 3b725603ee2b..b72348ccf486 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -115,9 +115,6 @@ struct snd_mixer; #define PCMDEV(x) (snd_unit2d(dev2unit(x))) #define PCMCHAN(x) (snd_unit2c(dev2unit(x))) -/* XXX unit2minor compat */ -#define PCMMINOR(x) (x) - /* * By design, limit possible channels for each direction. */