From nobody Sat Apr 29 07:37:38 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 4Q7hC63vwgz48d33; Sat, 29 Apr 2023 07:37:38 +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 4Q7hC63Fpdz3JPb; Sat, 29 Apr 2023 07:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753858; 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=KPFarQzLqsFX29Q9hrKXD1RkWJRuQBMekZw9GBPgxKI=; b=KwSh6NtLRSddwXhNuyB7D2LDMUiVltrLvX/SnodVCawgYi8pgqKs2cB1JP+9XD3SU8K75V 93I5xmHkjNWFFzzZuEDcpmSVgJ0XnmDek/7qpoRxmfLPCOT+iqPkPB97NW6VQo00QZPUZm qXVoCEuK6SB8BaFIwlvEXioCIc4r9OvxOc/2XYfs66v9nLrRC/KFkm+33hB4MyUFxFyGXt 4RkBdCYDp24Ya6CxzI7UsOzI72I/6YAu6KcGlVs6+BntUGOHFO8APkg88Pizvxz/ysjL+p EtgkiXUQ2RmIZduS034IUf3yCSUlZ9v57IapOKfLUzWlV5iO3CRjcXDgOBP80A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753858; 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=KPFarQzLqsFX29Q9hrKXD1RkWJRuQBMekZw9GBPgxKI=; b=QnYi4U0oMgioxDs1+zpFw8g7hB8rU87tW7jqYV+tYuarMPeNyNrw86n4sQyGjUXZXM2V1N e6UarPSeEwr8SNmGqKBaaFkGr9UT5BB/QHfhwcFF+PrNu7Bw9M+JeKerhKeP/dxmG+tr3X 0ztJSnKZ1y/osDYox2BB/H6kenycDaxpf/bs/rI/sOTSGDQK7wRmMtmhSAwEFVEAKPNgw5 0bVx7icGcugMZnDPivPvy+CthmOcR5nviikj3UNVSGdhcbwQoJJ9f6+6aYQQKX7+Te9/Wc Msmf5MsQasTqDkt8EpkZ8zvtQn6fIzjeTP0YVsiBhKtHO4UvO6+0HzRyjVi1aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753858; a=rsa-sha256; cv=none; b=lRp1zKwPTJhn3sF3J95OImYiA218L9Q9CNGr+5RulJHm+pV9miXyKDz1/UVotWW2TJz4L+ bzzj3xeOU/2G5aE5/76gZZJi7vEGSAq4URH5BVeQlyQofg8VOpzYXKzrQSHln3kSZwOB3R pWCJu9S/G1fJM+S2t4ZgedPGlDvoy7OYrLwjQPAeyr+RlkXDBiO/vCt0J0POxDaDh51W+t vGZlLXAo4/GhDaWoIhthoHIw7wQe6zTb4AuFvI+YnUA3xeT/Yft665dOBU3I76LgD1w/0d /D6Le3vTgu8To1jQASNWZL0Xw62xb1cKE0nJe1nNBwt4Wtftj7HRtSPA95tfsw== 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 4Q7hC62FvnzYbF; Sat, 29 Apr 2023 07:37:38 +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 33T7bc5p064592; Sat, 29 Apr 2023 07:37:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7bcvu064591; Sat, 29 Apr 2023 07:37:38 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:37:38 GMT Message-Id: <202304290737.33T7bcvu064591@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: aee90183065e - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: aee90183065e0e99d9a705b2800e9267dbb6c885 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=aee90183065e0e99d9a705b2800e9267dbb6c885 commit aee90183065e0e99d9a705b2800e9267dbb6c885 Author: Dimitry Andric AuthorDate: 2023-04-22 11:45:57 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:35:40 +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 96da4bb34d96..7f2553651e3e 100644 --- a/sys/dev/al_eth/al_init_eth_lm.c +++ b/sys/dev/al_eth/al_init_eth_lm.c @@ -849,7 +849,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; @@ -879,7 +879,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;