From nobody Sat Apr 29 07:36:51 2023 X-Original-To: dev-commits-src-branches@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 4Q7hBC5WLjz48crP; Sat, 29 Apr 2023 07:36:51 +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 4Q7hBC25j8z3Gjb; Sat, 29 Apr 2023 07:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753811; 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=gq0UWsL9cf6N3JYWUWurIlop2jqTlcCVKv+7AzdQQfA=; b=Uv007XzBWgOYzDsHXWEGWNGMKphtow9kqdvdC9/E0SC30Gx0uflpmq/sw/NhVW8LI0J+LN k3KZbWMOWuZ9bTYxUvEKzWeAXFYjpkGkr8v21Z/c5pQwqVrWBQAuLj0mOGGBRGGE3e6z1c ZLlyuIFxI1VyPDmeG0aLVaZ0FdAyOILBjeZyLOQ5PxW9xEhoTcOyEB0BN5YihpTDfyT/mt MM1MIxfIxqWMTxfRRReyHm3c7lfZFkZeMGZwbap90NTZgIkEh4ytjYESzWgFKvJR7NKMVm pQMoUXYklh7I2BzRqXKsavdE2lKsnv9E4uZ6JFrF2f1XHPKkmu44ipBf4UhIjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753811; 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=gq0UWsL9cf6N3JYWUWurIlop2jqTlcCVKv+7AzdQQfA=; b=lHwRdzTjtAhx1ZmHDonIdus326MnuOWwU2FrhUw1hHZXnDaP3N00oTj+vYynbtbJLtdnIM ynezjL6GY8zLEJjndsjitfhvgh4dY7mpOA7yl+m8YrOIwGDEnwj34g0vmAGHnSviPksiCM 8oLt8SUv3GYDmami3AAMh50h4yx+uIv8orf11oD/aZUu5Cr4QVc1RR/KCQOvugwPFkxnop W1dwGKVG8uQEziGZYUiMjlZxLPKoSMhnuKFMykh4aaAiXQmj4eLn0cHITHx6ZVKPVuDEjM 6nyXVDlipLnUxeawwABV+ns3xIwKCaZXDLGhjiZDvLyNUIarHUO4oi5QLT526w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753811; a=rsa-sha256; cv=none; b=xEVXxhqcv09Xx/0/4xsDa0glz643Gr2/Ang+fwBezKTxTw95Kfb5x37oVjytQFKHzMexQu 3/UJh6dqQI2reGf/5HF2uGPVWI9MGQR/92uJU0ZftoPEoCLw5h/WEK/bLOg2WphaRGm9wA VOb/34+hBzcww2KXWdLhebPMD75XDruFNlepm8V0/xj32EaxaNoPI787QV9gHLB08wfcVt h2Rb9IurRAtt+NmKvlMioHCYDljUy6H/9fV6GXQQih3Vs94TVYu8TQan7Bfvbeiq/mQyvL EhaRZiOZxg4hnz6VRixTwHkMSO4miD9PVIYQqkTh0rvK/6YEVpCurSGvqyWScQ== 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 4Q7hBC0wGwzY8Y; Sat, 29 Apr 2023 07:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7apqk064212; Sat, 29 Apr 2023 07:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7apMZ064211; Sat, 29 Apr 2023 07:36:51 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:36:51 GMT Message-Id: <202304290736.33T7apMZ064211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 99a98c68f441 - stable/13 - al_eth: make function definitions consistent with declarations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 99a98c68f441263f99eb140d846a188512be21e6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=99a98c68f441263f99eb140d846a188512be21e6 commit 99a98c68f441263f99eb140d846a188512be21e6 Author: Dimitry Andric AuthorDate: 2023-04-22 11:45:57 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:23:34 +0000 al_eth: make function definitions consistent with declarations The declarations for al_eth_lm_retimer_ds25_signal_detect() and al_eth_lm_retimer_ds25_cdr_lock() say that these functions return 'al_bool', but the definitions actually return 'boolean_t'. Make the definitions match the declarations. Reviewed by: jhb, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39759 (cherry picked from commit 9ea31d78f00d23612f3ab44d83265f8039f487af) --- sys/dev/al_eth/al_init_eth_lm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/al_eth/al_init_eth_lm.c b/sys/dev/al_eth/al_init_eth_lm.c index 12c9b0917ef0..5caea40e3bf7 100644 --- a/sys/dev/al_eth/al_init_eth_lm.c +++ b/sys/dev/al_eth/al_init_eth_lm.c @@ -848,7 +848,7 @@ config_error: return rc; } -static boolean_t al_eth_lm_retimer_ds25_signal_detect(struct al_eth_lm_context *lm_context, +static al_bool al_eth_lm_retimer_ds25_signal_detect(struct al_eth_lm_context *lm_context, uint32_t channel) { int rc = 0; @@ -878,7 +878,7 @@ config_error: return FALSE; } -static boolean_t al_eth_lm_retimer_ds25_cdr_lock(struct al_eth_lm_context *lm_context, +static al_bool al_eth_lm_retimer_ds25_cdr_lock(struct al_eth_lm_context *lm_context, uint32_t channel) { int rc = 0;