From nobody Fri May 20 00:21:04 2022 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 B502D1B40B26; Fri, 20 May 2022 00:21:04 +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 4L46p827qyz3kwj; Fri, 20 May 2022 00:21:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653006064; 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=msF7ynG7SFjCjY9K4bdgHw+aUVy3gUA5dIesSF7Qk4I=; b=KkPTVWiQivkE7zW8Jl2zjLK/FkpBpXLgLs3ZaeyVPvhkJRvwZWuOsBhLlUegoFBrnSKejY wx82mPH4zWiJFrqSt+9WfpCMzMIFOuzs+nSjQeM5ORUR31KyBESCPpnJ+PmVatZWfQfpE/ IcdSdyM98LIsZV7twKH2I/xbuNglNqZjRLJ+5Iuz6dhhGSSbei0PNPDVEi9Vv1IfYMLjVy n4jIQrxogpQEUhsFcnEIeui8igJGifw9iMUzH1PCKY/H5XL9QNbAsGaPp+AmlkpHWyQQXZ Apynz20wl21RfOSk4yVaFwkNCx6+cx7EUc9Em+jFsntTlkiudXVg4dypJt+CQw== 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 1689A27939; Fri, 20 May 2022 00:21:04 +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 24K0L4Sv071938; Fri, 20 May 2022 00:21:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24K0L4Yu071937; Fri, 20 May 2022 00:21:04 GMT (envelope-from git) Date: Fri, 20 May 2022 00:21:04 GMT Message-Id: <202205200021.24K0L4Yu071937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bde0080b3dec - stable/13 - pbio: Return BUS_PROBE_DEFAULT from probe instead of 0. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bde0080b3decbc668bbda64d427b441794f92790 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653006064; 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=msF7ynG7SFjCjY9K4bdgHw+aUVy3gUA5dIesSF7Qk4I=; b=KBrJ5YIbE0+nR+/oLMn7WxiADDscQlFxvxD3BMn1E56gCY5X8RffPwWL5e872v8RbHGH6X iTpSQZgzZlSK8Uv9xr+YPy8NIzGGLo1Kzzkbf++TOqzlL0f6P11L8JiYPmR5ClHcjk0Gk9 VP9uOS+TDoAW/nB2kiyb4xXA0fZUhEqGPIjXmlLxXBHw3wv809hEyOdabVt0UqXl5cBzgQ 48uVlxj2evDmy9RD+W7bPb+OBcoFwiVqy0q0b2XqTMrmmvYxOngNh2tPIBqOmrAuUhXaJ9 rKcZniXEORlWEoZjEG+v9jGBvX1JCh1jsJVY+mWrBcoUL+xgUjhEjRMomNC+qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653006064; a=rsa-sha256; cv=none; b=yDn3aH4agyt8NJYzdTMUWlhskiZGnKqVuD2jxJt1egLYBTE3ux08aAx9hNF751z8u8wc9O 5Fmf8y/lZyp0LA4Q2snvLV09ycTstf9q31Zt2VslP75jF7mYqzfCkcGbbwXA+fSuXlJ3h8 sXbXMsRroHO5pRag9AwPFPu2GPd8mSzmuSnFAvT69UMDfZEveEC+3DLfDpg6wUkoOB56pt FBlejUs3hBMf/E1ttl5sL3WCWm1Mp5UldRXY+9uwEHTuIdXT3cEGbggkp8cTz0FKsQRzmI xxIPO7qKymuQpuc8d/+q0IdMI2XTCi9T2GTKWCCc/ypXzt+0y5exbc2Kztd67w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bde0080b3decbc668bbda64d427b441794f92790 commit bde0080b3decbc668bbda64d427b441794f92790 Author: John Baldwin AuthorDate: 2022-05-05 23:39:19 +0000 Commit: John Baldwin CommitDate: 2022-05-19 22:01:50 +0000 pbio: Return BUS_PROBE_DEFAULT from probe instead of 0. 0 should only be returned from probe in legacy drivers that need to preserve softc state between probe and attach. Differential Revision: https://reviews.freebsd.org/D35080 (cherry picked from commit 4942e8df472bdb49e72a8c9b60e8189bdb037b8c) --- sys/dev/pbio/pbio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/pbio/pbio.c b/sys/dev/pbio/pbio.c index 837b419e298c..516ec3a73408 100644 --- a/sys/dev/pbio/pbio.c +++ b/sys/dev/pbio/pbio.c @@ -200,7 +200,7 @@ pbioprobe(device_t dev) /* Set all ports to input */ /* pboutb(scp, PBIO_CFG, 0x9b); */ bus_release_resource(dev, SYS_RES_IOPORT, rid, scp->res); - return (0); + return (BUS_PROBE_DEFAULT); } /*