From nobody Fri May 26 20:06:58 2023 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 4QSbYG3Lsfz4Crrb; Fri, 26 May 2023 20:06:58 +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 4QSbYG2pMcz3CsX; Fri, 26 May 2023 20:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685131618; 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=QrID28GCnV5zu+SIOTtIYaRIPxO3cmbs8wPLNOJth24=; b=ppcpGpCmW4LMbpvy+0L+2VAdJ3NuUu7AInoRx9ZGx1ZlUGsiDkRnGCudYLA8/lgUkwafFf DlEaYj89jQOkDuvefmXyd52hARMlNWlBTSrO82lLDDDpKHigIf1zH+GP/gCgzN54kDRmgC n6HDjhGa9Sf7Mkj5m+W16FGB6lLbu3MG8rgBk5aJaOOOvFKseseTAiZFCuBKtwptbHUHdO KL8jZO3qZD797zwbClvmgURlH7NzmG8KWga/HwWIt071Y/SeKN6faLTFQA0LjgTTpwREbo HZtWQvmJQj1YfbLDM6TyTqhbvxY3uXrCojAvAiwtJe5OiJxYCugln7lHo8GBWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685131618; 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=QrID28GCnV5zu+SIOTtIYaRIPxO3cmbs8wPLNOJth24=; b=Is2Yznf6d0IuMeZ7BiLkliWZkSHogvgeOESmkm5qfC4gO1JCFJKTCnyxxDUdNNtV86y7cX rYFNTgAOZanrhSrAk7IMZ8UcorJZbQI2OO2bRF26fptAwgisH5fsJGrW3zU3RHyWuJOqUJ NVLKnjjNFkHia1COmPxBcj2XiNyeiac4jZRuS/JqlTLQ41QASvYsduwFGlT1+pJFpRKlfP xCq26+OX61vZcP9WUxKxumXp+nptBuHtz1U0FajBB45JTbhp4CpTcRk7VrHy7nQ4GdNdTZ egpHBX2ZEYLeQdvPDz5gnAWMXVuRObd+wwSupPeh9PtST6982vg2S94QNje6BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685131618; a=rsa-sha256; cv=none; b=MsW7Klo8qAC6S71QhoamLe7OI/qwuxP8aWUH79EXkTy1uXzzNnoneowRkerVSwsCBMUVOs gBhMuEMXje7QfeU8kDbBJ4mtWuzGf1Hs8MPgAmqKcesdevzta1Mncy37WhJSALm+ljca0K aZsu1PGH7rqSj3aiBEcKFzxW5YwVNp7AAM3jnJLKzi+aP0X7jGFb4LxOf7puBVHzjNIe/i 27twIeA+ABnXNZs8Lu/xiK4FqMen8twnHFmHO2aLy99Vrhhg3KZJ3kIUKoh6hjWQ7tg9iF 4gaB9vB6cre6mpnn/3qfZ/9CZ1z/csbZb3chEco61Ln0yfAALJIxwmJk6KbHlg== 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 4QSbYG1pM5zKXt; Fri, 26 May 2023 20:06:58 +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 34QK6wsO098232; Fri, 26 May 2023 20:06:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34QK6w5s098231; Fri, 26 May 2023 20:06:58 GMT (envelope-from git) Date: Fri, 26 May 2023 20:06:58 GMT Message-Id: <202305262006.34QK6w5s098231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ca4c78590095 - main - nexus: Consistently return a pointer in failure paths 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca4c7859009549975229d854888231e48938035e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ca4c7859009549975229d854888231e48938035e commit ca4c7859009549975229d854888231e48938035e Author: Mark Johnston AuthorDate: 2023-04-26 21:19:28 +0000 Commit: Mark Johnston CommitDate: 2023-05-26 19:38:08 +0000 nexus: Consistently return a pointer in failure paths No functional change intended. MFC after: 1 week --- sys/arm/arm/nexus.c | 2 +- sys/x86/x86/nexus.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c index 48e766b0cc62..430373d3679f 100644 --- a/sys/arm/arm/nexus.c +++ b/sys/arm/arm/nexus.c @@ -256,7 +256,7 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, if (needactivate) { if (bus_activate_resource(child, type, *rid, rv)) { rman_release_resource(rv); - return (0); + return (NULL); } } diff --git a/sys/x86/x86/nexus.c b/sys/x86/x86/nexus.c index d02d081de1e8..332b1527efbd 100644 --- a/sys/x86/x86/nexus.c +++ b/sys/x86/x86/nexus.c @@ -388,13 +388,13 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == NULL) - return (0); + return (NULL); rman_set_rid(rv, *rid); if (needactivate) { if (bus_activate_resource(child, type, *rid, rv)) { rman_release_resource(rv); - return (0); + return (NULL); } }