From nobody Fri Jun 21 12:07:33 2024 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 4W5GMB0lLFz5NYQn; Fri, 21 Jun 2024 12:07:34 +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 4W5GMB050Kz4bll; Fri, 21 Jun 2024 12:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718971654; 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=dZ9erjkq2Xud8YVh8+hRavOj3BilVaSVXsdZXFzFehk=; b=gtooYGFxvQh1rkFMvoQRT9zZkPKnYVD480qf3w8lppnUQwII+J8+u4vu7iOxeo1jhLPXju tEmaArWh6fsdgWcFiqczbl6tOjGgXBk7uXAr0RYDKMOh3DP2eDo78WH+c7qhoQFINKrR9J hkLARxu43qhD6/4MsC7/T51psMc6mvmBApFyRNzcTVEZXSW6EIJyXQjIAYJQT95SI+yr4l nkQ1189hYawzdYjWwHSdY9hofso7XWm8Ovh+ryANzODwCgpyIqOS7IID75JyYGMHafSyeK DUepeoXKMmw7Z0czhL6piqcyJICcnkaT20WtbpN0hmQ4mw0NHsEhvlc6YKckIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718971654; a=rsa-sha256; cv=none; b=TC226pKboWeOGsNUaaaX3ybllMyrjtGGhQGW9TaFmtkTEF4zxRC5cxITtcWSKOHOMakGRS 5c7aeXut9+Ev8l7O3cdHSMp9fnHaFdL9ewBjERoFxov+yMNO/WnrC198BOrK42nDTFj46o MnaNoO4HTerMWGWA6TuaYj+1iTxDXpgnllxsT16BNrFYX3Nk1hmBEwd8+cqhRrz6YHwEdD Uo2Vwe6/5pDI5NF9mFKeTgtEaUTUzyX32nWlmb6/4W9yqc2J2iHGxb1RbMuyNT6+33B1+r 0yfkSP4R18SWhk4rD/ud64YDK9L9HpoWBQ+XZvJNENVAJum3DaAxa9EtOwQFSA== 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=1718971654; 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=dZ9erjkq2Xud8YVh8+hRavOj3BilVaSVXsdZXFzFehk=; b=pGJHYzSvDDtm/JPDJWblJKUh9bmdsCcFEjTXdSpyL3D9bcf73WH7k8ibbLFN2n4BlSR+Ui OpVyT7dQVquM2wb03liGL4cnpI7CrliwfiJ1RHRb8/8pJjvzaKW0VfycVheUGY/aT5mvDi SS4/nx1wwQOVouy4aVhDrDl/aE3AtwWaJ+g3WfPMNY8rcVfvefcYX7I4EBL1nfyE/bXJvI HU1vkF+LyhLFd0ALL0mg1FGGrpKwj3EhMQGEsCsfazj30dxeXkorR1jOGmZFOURxOtlma+ MM80/czB0jSl+CavEb4TZzaEs9iDPDGw+CCbD2p63KjDjwap3Zb2LZ9goGZHaA== 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 4W5GM96lmfz16hK; Fri, 21 Jun 2024 12:07:33 +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 45LC7Xd9011159; Fri, 21 Jun 2024 12:07:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LC7XJB011156; Fri, 21 Jun 2024 12:07:33 GMT (envelope-from git) Date: Fri, 21 Jun 2024 12:07:33 GMT Message-Id: <202406211207.45LC7XJB011156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 3fdf11fe8fb0 - main - acpi_timer: remove leftovers from Garbage-collect ACPI-safe timer and friends 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fdf11fe8fb0a532cc8eafc92b7b12ca40acc221 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3fdf11fe8fb0a532cc8eafc92b7b12ca40acc221 commit 3fdf11fe8fb0a532cc8eafc92b7b12ca40acc221 Author: Baptiste Daroussin AuthorDate: 2024-06-21 07:57:10 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-21 12:06:26 +0000 acpi_timer: remove leftovers from Garbage-collect ACPI-safe timer and friends Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D45669 --- sys/dev/acpica/acpi_timer.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index 49474f71dfcb..3d51a4211b80 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -154,7 +154,7 @@ acpi_timer_identify(driver_t *driver, device_t parent) static int acpi_timer_probe(device_t dev) { - int j, rid, rtype; + int rid, rtype; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -188,16 +188,6 @@ acpi_timer_probe(device_t dev) acpi_timer_timecounter.tc_frequency = acpi_timer_frequency; acpi_timer_timecounter.tc_flags = TC_FLAGS_SUSPEND_SAFE; - /* - * If all tests of the counter succeed, use the ACPI-fast method. If - * at least one failed, default to using the safe routine, which reads - * the timer multiple times to get a consistent value before returning. - */ - j = 0; - if (bootverbose) - printf("ACPI timer:"); - if (bootverbose) - printf(" -> %d\n", j); acpi_timer_timecounter.tc_name = "ACPI-fast"; acpi_timer_timecounter.tc_get_timecount = acpi_timer_get_timecount; acpi_timer_timecounter.tc_quality = 900;