From nobody Fri Apr 8 00:03:32 2022 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 94CB51A879D3; Fri, 8 Apr 2022 00:03:33 +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 4KZJPK1QSBz4kpw; Fri, 8 Apr 2022 00:03:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376213; 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=QDs0VfIWI9H1od8wuKnS38UIYBHVDmh8df0hYPNnG8g=; b=MZeolvFjEqKuvDXeSRXbiIYSIDewRsOXA3T3cIuOROHrxSXrY9yi7qKE1zFX8XFnCXB+Ww SxudixghQ6hy2+9kOm7JmR2i7lL3Ksfw6v0dC1FDC9V9d7TVwEGEtfCgs8qT/8sIm06opE zAmsF5A1QmmH3vyoD037zFAYsNEljyA7sK6+KXcsixuwYlOLdjwVi4DwM/0BfM6QJRre40 rqXD8oeD2cAKCVeecTASzPGs15rUtNuu54vk4cKF3TTFo+DejNS8wQvw/UyFE36FbDt/Kd M3sjcbxBlTuukPeRZDlWGyaFLk1s0vRKDmwA/ulj6VtH7CQWglT6e//4DbjyZg== 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 AF1901A02F; Fri, 8 Apr 2022 00:03:32 +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 23803WEN086492; Fri, 8 Apr 2022 00:03:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23803WZr086491; Fri, 8 Apr 2022 00:03:32 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:03:32 GMT Message-Id: <202204080003.23803WZr086491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ee07d7121314 - main - qlnx: Return error from qlnxr_mod_load if it fails. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee07d712131468908a61b948851ce17be76931ac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376213; 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=QDs0VfIWI9H1od8wuKnS38UIYBHVDmh8df0hYPNnG8g=; b=dceA9tDleulh1LwcTnGCIFf3teE3vXrqjE8gj7xMCEFNvjU09REd9OG7q8G3MSuOf7FZvU e2J7sTqoD9SAsxDP/VxeUiYLJzvZFOmk2EM4BFBvrNj7FDIJIklvIAFzzo2Opz0nWTSjXn tPA+daVgFdf08lnIhBT3T+zQ2L+HI1aQWbY9diIbc+KIXy6wdbAhlb6FIbYwSoAvl0jRiw Jl4xoa+kuloIVMtW416Y98hshvCc+xi96nkOyOCHyyAsDuasbs7h570KB/5spCxNPvSmB6 xGDPy2DIMQJxDYMuBMFj2neQRN5b6vb8qZAnWwTFK4RUYZXR7vBET1s5/QrqiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376213; a=rsa-sha256; cv=none; b=C75jjtE+uX7Qz4ar4xy2voIzoenZT9ctQh2BuGwIQtWZkAmoVP7hqMCpDlBm76mE8TkBf4 rTloh0QAaxVMgPHntPnPEy2iS12HJXgrZV5qSJjXtiTPXWJLtFyGGi270E+cRATC/50Lgc J99Pg/AhxlhsOfjHqzFiGbRAJRNtJNpE05wKNkv5QSZ19eqJUUX0FKkFcfA6PXsPQFaHEC 2aPzroCpp8msmL/J6ltdE1JeieDfp75ZD17rNCVVDTvdT2kTrINq/bvm3p7BJFeqnHMfFb 7WWj+/o2++oRCBdrnmshN2eNx4Op2vGAVetZFmV7SWzZuBshqmR5rSl3CWrQRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ee07d712131468908a61b948851ce17be76931ac commit ee07d712131468908a61b948851ce17be76931ac Author: John Baldwin AuthorDate: 2022-04-08 00:01:27 +0000 Commit: John Baldwin CommitDate: 2022-04-08 00:01:27 +0000 qlnx: Return error from qlnxr_mod_load if it fails. Fix qlnx_rdma_register_if return ENXIO rather than -1 on error and propagate that error to the caller in qlnxr_mod_load. --- sys/dev/qlnx/qlnxe/qlnx_rdma.c | 2 +- sys/dev/qlnx/qlnxr/qlnxr_os.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_rdma.c b/sys/dev/qlnx/qlnxe/qlnx_rdma.c index 26b1679ca137..68d9196fb7c9 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_rdma.c +++ b/sys/dev/qlnx/qlnxe/qlnx_rdma.c @@ -246,7 +246,7 @@ qlnx_rdma_register_if(qlnx_rdma_if_t *rdma_if) return (0); } - return (-1); + return (ENXIO); } int diff --git a/sys/dev/qlnx/qlnxr/qlnxr_os.c b/sys/dev/qlnx/qlnxr/qlnxr_os.c index 6190a69e413f..b4771e97b705 100644 --- a/sys/dev/qlnx/qlnxr/qlnxr_os.c +++ b/sys/dev/qlnx/qlnxr/qlnxr_os.c @@ -1300,7 +1300,7 @@ qlnxr_mod_load(void) ret = qlnx_rdma_register_if(&qlnxr_drv); - return (0); + return (ret); } static int