From nobody Fri Nov 24 22:01:48 2023 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 4ScTTm3DCxz51kR0; Fri, 24 Nov 2023 22:01:48 +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 4ScTTm2q9Pz4cPx; Fri, 24 Nov 2023 22:01:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700863308; 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=XjaGLRmwqvoUtZ4dQKFD1pFZjj13nuGIdJTV6TP0J+M=; b=OraErKQZwtZ47GR8fYYFFBjSqQwe65PXHfX1MUWwhUbjDLCqm+p+Ckbnj+ge5GNfeplcEB z429+q3s73EHrzF61iSu3LBcjf/ruASDGQEgv40PmDHhdbN6aJ8wEFpg474avwbmjzWZVo /T/HECTkYRuPvUYEMg8BN84POB7s81P5CJccyleIdg5UeAEHuiUNdf1m2F9ZkhG2+ybJhW xIEWVq4YQZuFRocCdKiqFLdBtZZ37g79gHbHJSkvuvMqYOti3d0tYmXYI/npv5Y44Big9u 4T1puLvtHPsQMK8JxBViemJDdCqaDccNXnw+oIPPPfb6y2wUYz0kkJaJ4lX4vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700863308; 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=XjaGLRmwqvoUtZ4dQKFD1pFZjj13nuGIdJTV6TP0J+M=; b=YKGAkrBAF/aRo3b1ip91NqxL5knBXUo5XWFsdf/70tSSQobB8FUwAIl2DTiiIM2SnzgBJo MVU9mbKtQtSP3u3CtTlaZnQfUxPfMoz4CtLZsi2TcsTNV43/Q9G05xmTn+bRi1+Ghrs39t 0AdE4taat17M+zD950b67d++Yv1FihiSgx+CM8hTV/+Y8UXqgqDVmJ5wuZakkO0PmptcEs A/JSAftHg6B3nk1CUiMh/DYcRrKyw45TJ7CfrqYj6p3kRkJ6OzK6zxc2ppZx/BZ64aUxU7 DFurCnag7jGPc61PjepE8yYSO3ZUEEMKVpsR7SF4pE4fdvtk9HGggtvz69H9LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700863308; a=rsa-sha256; cv=none; b=B8YgBkRPjnYIWQ3GtimM3GFl6ue8bbRmpj7YYnp4GfuzkfOAckBcNaYmBxxTMwo86uo6C2 qtZE+3xlU0TquxyXQtBK9tF/Ftb7Y9nd3RRsSSXRBfIH8VR0wiRgpqgec+Dxv2ZubqxPFb bwjWVRcWIW8Monb4/N8d9GrKVC2o4jGWmg73DCbDRs0X+qZhPffqOqL11h+buwVKAYp3NZ 4vnRYKYbDIdKZN+L1NwQCi9ovTOehtR5wfBEhly1a3+qB1FTVuCwfIM6BpfwoQU1rXrF76 FHpW/ZXUlTVpuIl8KmKrNL0AHNFyMQ8qVMJKwPW4f7ZETJkPWBgrHepcHQsw/g== 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 4ScTTm1tgPz12h6; Fri, 24 Nov 2023 22:01:48 +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 3AOM1mSg018444; Fri, 24 Nov 2023 22:01:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AOM1m9i018441; Fri, 24 Nov 2023 22:01:48 GMT (envelope-from git) Date: Fri, 24 Nov 2023 22:01:48 GMT Message-Id: <202311242201.3AOM1m9i018441@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: 5622f52c98cd - main - aarch64 nexus: Fix a mismerge in nexus_activate_resource 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 5622f52c98cda7df1faef11d847e04500158e107 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5622f52c98cda7df1faef11d847e04500158e107 commit 5622f52c98cda7df1faef11d847e04500158e107 Author: John Baldwin AuthorDate: 2023-11-24 22:00:33 +0000 Commit: John Baldwin CommitDate: 2023-11-24 22:00:33 +0000 aarch64 nexus: Fix a mismerge in nexus_activate_resource Fixes: 658501d25930 aarch64 nexus: Use bus_generic_rman_*_resource --- sys/arm64/arm64/nexus.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c index 32b5542f1916..2c19d4ecfc0e 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -367,10 +367,8 @@ nexus_activate_resource_flags(device_t bus, device_t child, int type, int rid, rman_deactivate_resource(r); return (err); } - return (0); - default: - return (EINVAL); } + return (0); } static int