From nobody Wed May 13 12:40:01 2026 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 4gFtMk1Mskz6dLPZ for ; Wed, 13 May 2026 12:40:02 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMj5qRmz3w9c for ; Wed, 13 May 2026 12:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676001; 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=C2IrRUvpk0XEAq5J/OgHTuxfQbrsxL/MG4bo2pWeBvw=; b=lC+wWektVLPRoFcc0qLUhGTT0JmlX7XzfPsZjK6XAOSvrGfCMFtv9DJcSolGc+6cVI/ZIv +UPGcdzhF24se/pKfHdicAIaLYvEx/GPqGk1yDznt2eu8po0pjQw1aOYNeNAtRpWyX4Hp6 fAkbc1W2bQ6BW0aTe3kosflle6GzANNAPwW7uuZsigQ1a9RuV5A8bX6R0jpt1nrjCh/Fdx zo4P05TR1dZwpVQHysdXWUqdrckib7thcqs7b92i6RAVUcKEbfXQz15lBxudVDXPnReCI4 QqhioBGhAPj283BdiR0L5GNvXEPqfpg2i8Ng71i+Re7+NoT2gP4EntPeniVc0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676001; a=rsa-sha256; cv=none; b=l8cQKPkoI8l+HDgx/nsVUlUlvA8eKfExpXBG64KKq4jsfnNyDC/QvpMMweJXGptf0H/f6g WGlliiNA8V1tV7wfn8emcrT+GVgVcwo4yexMl0Rmydf9tR5J/JjOLVylUHhA8m/Fifyt31 hxFTsWpS4OTFwDRwtw296lBB4guxcmqW0XwrlSmYEV1o9X5EE9/lj6wGsEL+5QZ7k/wCF9 4UE6PcKVWa2EPwTjEuxhW0sl5bHbr86bhpyv8ScDElBdg6GxvBwvdSGua3utQK/yoxJpsP dO8NBYBY/ER/b8rtVFA+BQEfrCw6iy+S3cDdp0SkEz1EK8+Bh0H4cSTCjQ5Rxg== 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=1778676001; 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=C2IrRUvpk0XEAq5J/OgHTuxfQbrsxL/MG4bo2pWeBvw=; b=wTB6sIDdKbJ9umJC2Dwac6zHR6ChcY8RaAIRl/RhzhPkYI654UTbF514JOXp4IxtHfcNYS B15jqlNjNro3cB5YRtOElJtahOBxTNOPlr7GvjcL9FPat6dayDuBR9VRK3uXboBNpcYvfT 6+rN6MxVtHNQzO6CYmph3hZA4AJZPoHGHgAvx+uUu2hNyxLWQ83BL4NzO1Ak38CbcFFytb bCxUOVFQaNJEv/siJYGaPfpTpKvfxOd6eGYkV11kPNNatXK4k7CFP5+NHFCir6rWcMmYrX 8zxZdZxZsQghjDdfbgKUmP09J5rECtNDHN1xFuJzNSNtsP5gUkuD5Su39txQEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMj58KBzqyX for ; Wed, 13 May 2026 12:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 196fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: d765d209c3dc - main - acpi_spmc(4): acpi_spmc_run_dsm(): Rename, rename parameters, constify 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d765d209c3dc5d1eca781cab97c8579969b1e7d5 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:01 +0000 Message-Id: <6a047121.196fb.7554a77d@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d765d209c3dc5d1eca781cab97c8579969b1e7d5 commit d765d209c3dc5d1eca781cab97c8579969b1e7d5 Author: Olivier Certner AuthorDate: 2026-05-06 12:02:25 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:24 +0000 acpi_spmc(4): acpi_spmc_run_dsm(): Rename, rename parameters, constify This function actually runs a function of a given DSM. Remove the '_dsm' suffix to remove the inaccuracy and make things simpler. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56877 --- sys/dev/acpica/acpi_spmc.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 1ce4401ebcf4..b2da99864581 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -727,14 +727,18 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) #endif } +/* + * Run a single DSM function. + * + * Discards the result, but prints a message on error. + */ static void -acpi_spmc_run_dsm(device_t dev, const struct dsm_desc *dsm, int function_index) +acpi_spmc_run(device_t dev, const struct dsm_desc *const dsm, + const int function_index) { - struct acpi_spmc_softc *sc; - ACPI_STATUS status; - ACPI_BUFFER result; - - sc = device_get_softc(dev); + const struct acpi_spmc_softc *const sc = device_get_softc(dev); + ACPI_STATUS status; + ACPI_BUFFER result; status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); @@ -758,13 +762,13 @@ acpi_spmc_display_off_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_DISPLAY_OFF_NOTIF); if (has_dsm(sc, DSM_MS)) - acpi_spmc_run_dsm(dev, &dsm_ms, + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_DISPLAY_OFF_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_DISPLAY_OFF_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_OFF_NOTIF); } static void @@ -773,13 +777,13 @@ acpi_spmc_display_on_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_DISPLAY_ON_NOTIF); if (has_dsm(sc, DSM_MS)) - acpi_spmc_run_dsm(dev, &dsm_ms, + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_DISPLAY_ON_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_DISPLAY_ON_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_ON_NOTIF); } static void @@ -790,13 +794,13 @@ acpi_spmc_entry_notif(device_t dev) acpi_spmc_check_constraints(sc); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_LPI_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_ENTRY_NOTIF); if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_SLEEP_ENTRY_NOTIF); - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_INTEL_MS_LPI_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_ENTRY_NOTIF); } if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_LPI_ENTRY_NOTIF); } @@ -806,15 +810,15 @@ acpi_spmc_exit_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, DSM_INTEL_MS_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_LPI_EXIT_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); if (supports_function(sc, DSM_MS, DSM_MS_TURN_ON_DISPLAY)) - acpi_spmc_run_dsm(dev, &dsm_ms, + acpi_spmc_run(dev, &dsm_ms, DSM_MS_TURN_ON_DISPLAY); - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); } }