From nobody Fri May 17 19:30:51 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 4Vgxrr4B6Wz5LfyT; Fri, 17 May 2024 19:30: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 4Vgxrr15rJz4tyc; Fri, 17 May 2024 19:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974252; 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=+MRPVHO4RddqituVD2jQrGtTnql5yEgKOtckRSAjPyc=; b=ak2RTNlkhQ09qpTP5UVV3bUEd0ZiEmxicFdu5ixO0orO8KmELMWO5O9FhCFAlOTerqL83p 6h1V2E/o7kXpSu4tCm1w2kl+oO2nWwJsHCNxsgWY9+UYmNF6IlYWqz5mmfF2nfa0N3jGOB N4PNSzT6KhoZSvjliy9OdFFSZuM3VdMUdnqKhHzVGoMObYel6U2bmC797bo+b6XUX8RGDH kWBKNmMyfgLmSgevO+0kNTbPyOahzRADQxhugxgKjcPpxU0qOo1Ss3uqgbNKLOuunOZCXO LblMZgVT+jahQ/GfKUngNZszKa8vVf3xQEWlekCv8MvYAN2JCZDDm6K/NZfXEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974252; a=rsa-sha256; cv=none; b=TNcX4iC/5d2PnuChbdOAnhzmuO7sI6uVJQd4QqxociMz4ztgKaNGog3NkJb53b2+FDi3ki AjiEj5w2wDd0ECKPiPdfn3aBvn9CAhPw29WyZipfCDrCxiT1Sbb6swI0hapgDyJ6wgrEFE UO/ydyrypVtbr9pLtXY/olvMaZQEyDkuzvMsUq3WW4Hcte959u5PDCAI6R4cqJVjjhmypK qG2J70tqmxLzu+IJMgphzz1TXZ5v0NwDMNhtqGd3aUiXuAeheRb0Km1maHV4VIiptIVmpq dnIrS1RYfW8j4ARyNSjMXFqXiCYNEaPecENz43wX0sbzlSeAaCv5VePMh46oJQ== 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=1715974252; 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=+MRPVHO4RddqituVD2jQrGtTnql5yEgKOtckRSAjPyc=; b=k4bTbUjJcxwOxB8z8hon8+rIx8vxNmRMYUd9Hn0rsMY0DN8BmxQmTPUcXlAlJgaCo8R2W9 G5ORUD0uwtTR4AFTqmzXIHmY36FncRxSmf1aWE+OxhnHV02TPB569e/JnfcmlVC7248bA/ AQvt57ny0nmUN67OSATlPffAzlQO+N/Y8iFXc0uuVt75dBV9rvBHI52X7zjCc/JGN2+j4P /4Nuh9NR/JVvEBEcHWpFHzvgdiSQv8CnmTvOMTaqq4zDnZxyJe30O/uUjhJWr8MYXsRpxT wgVuYAqzERnbwPqxvv7uXJLdgvRkRLy4eW+3FcQGQeA9J1EUDQBcP4yOmyVB+g== 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 4Vgxrr0XckzvsK; Fri, 17 May 2024 19:30: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 44HJUpqW099248; Fri, 17 May 2024 19:30:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJUp0S099245; Fri, 17 May 2024 19:30:51 GMT (envelope-from git) Date: Fri, 17 May 2024 19:30:51 GMT Message-Id: <202405171930.44HJUp0S099245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: decc224ab899 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: decc224ab8993797473a5d37d60588a021965d2f Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=decc224ab8993797473a5d37d60588a021965d2f commit decc224ab8993797473a5d37d60588a021965d2f Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:15 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:01 +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 (cherry picked from commit 8b97dce6973ca1b6c3407c34c76d459f43ca1061) --- 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 24fc5678af71..2f4a6f4d6395 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. */