From nobody Wed Jul 17 13:00:10 2024 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 4WPGHt4W1Dz5RHTw; Wed, 17 Jul 2024 13:00:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WPGHt3zcLz4lC2; Wed, 17 Jul 2024 13:00:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721221210; 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=6Vp1b9eKHjBV5Df1wwk41QS/AaV9ycVDMo5EsUrIOmM=; b=s2pl6v5xB9IWsl87o+h1hfCph8OoIhDQQP8Qj/CzLmzkhfnkzak/tejBkBujBAcjMbia3C 5hM/ss9yK9G1wWFsmB4lPPZXRR/XOCGjs+OWPa1LnCpcUH/7GClmr/NHsow3lcnEt/fIt0 jPXtpbcepGpM7Y1TqhJLvQp4byQG9OsOs+6JYz6dEvNOpSGVPo2vV2yejisR4JKBuwNNp2 2m/PjwZtJQRWx0zi1rrqP4BdwoGQjMmukz8QKJaqlI63hAgeOhibuLzgnU4bjJCs3U3ufN CJbHV5YhnRT+cY1Or4XIjdAzNeN6Bh0sp6ACTVswHMhoDLJxenL61vqeRBmBUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721221210; a=rsa-sha256; cv=none; b=cS1mUdC8o/zSZWyGHgvs3lDO4IpEU2HhbV7HKiWhsfGQP4OwDbRB2m3aL63Y7ss0rrXY1P aBV7NZ6DpqdvUSXaMqKTNWFU1hDoV93Z92ecHa0TNIz2sVJpcilxoJeiiv8VlW3ztkdEQk B/rqolKSVKsqw2WmJ8aJFUS9eA1gKk7we+o7J2KYNVZ6njdCntfKkiiwZhADsx6LTp9Epi xjBcN0uDs4V5vYKs7cq4hQjGzAIrmovkFRTBldSmi/lm0z9oE8M82eVyRso4ZPR/SD59dN 3HDuQGALb/IC6GEOHC3A5gQt45Cm6QXg7A0yQTXEXEQ9C36QUVZ5qIDF29Kdiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721221210; 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=6Vp1b9eKHjBV5Df1wwk41QS/AaV9ycVDMo5EsUrIOmM=; b=LXSP5UPGQqq34+gopmFm1FcqFMQqa8ikqjwqYSYe2vQGfNUkqCUtfX8uegghLg67O9OELy yIdP/tlOr/0Qwgbu7yaUmV4dV4yz9dN9NFxZPBjLxYMQ5cOD+PJ7oua3vDYulBiHeMHqQH +P/5gg1btkj/p2ZY70vlvlfb6P1zB3LVzvREwCVPAmz/3jwklsJBX/xR8qobBzm/6S+gZR xR5q5IyoMmpr/XDwdUqRGrWswhBndtS/vDCeBouMaMlTD0MGilVthDqPAZADj+pvjOTr/4 v/gsM9Cy6jTD4M2xFDqiy4FaAweEYy5UkXNmWJ204++BGp6WflwPsNVnunH32Q== 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 4WPGHt3c40z1KhT; Wed, 17 Jul 2024 13:00:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46HD0AXT085048; Wed, 17 Jul 2024 13:00:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46HD0AHq085043; Wed, 17 Jul 2024 13:00:10 GMT (envelope-from git) Date: Wed, 17 Jul 2024 13:00:10 GMT Message-Id: <202407171300.46HD0AHq085043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: c24e5fcca9c2 - main - mvs: Fix to use rman_get_rid rather than non-existent rid argument 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c24e5fcca9c2f2cacaf3d7883f0ecb4d5a4747cc Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c24e5fcca9c2f2cacaf3d7883f0ecb4d5a4747cc commit c24e5fcca9c2f2cacaf3d7883f0ecb4d5a4747cc Author: Jessica Clarke AuthorDate: 2024-07-17 12:59:13 +0000 Commit: Jessica Clarke CommitDate: 2024-07-17 12:59:13 +0000 mvs: Fix to use rman_get_rid rather than non-existent rid argument This got missed as it's not built in a normal tinderbox build. This fixes building arm.armv7 ARMADAXP (marked NO_UNIVERSE). Fixes: 9dbf5b0e6876 ("new-bus: Remove the 'rid' and 'type' arguments from BUS_RELEASE_RESOURCE") --- sys/dev/mvs/mvs_soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c index 00a868140a0e..b48321b04955 100644 --- a/sys/dev/mvs/mvs_soc.c +++ b/sys/dev/mvs/mvs_soc.c @@ -372,7 +372,7 @@ mvs_release_resource(device_t dev, device_t child, struct resource *r) rman_release_resource(r); return (0); case SYS_RES_IRQ: - if (rid != ATA_IRQ_RID) + if (rman_get_rid(r) != ATA_IRQ_RID) return ENOENT; return (0); }