From nobody Fri May 20 00:21:02 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 5EDF81B40842; Fri, 20 May 2022 00:21:03 +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 4L46p71Nqhz3kyP; Fri, 20 May 2022 00:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653006063; 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=eCO3hZikSpvWWQB1vBnKuY0e1gJvJWBi/uYqJ/hi7rE=; b=kKWrgboi0C+nVVrURbMwP825c0fPW9mNu/kVrdJlb3e6xGCkAZtG7XD/tevzvbSblXRsci whq/hiu/uyGO2afw5nhU307/ghxa7WBamxmdvQVJPRugkh6MvOmi/qdHPa5a2r8rEibARX AYq7k7o8Rab6+0AXgU9wk3mebqhKWl8j/igkNoU9qn09bBr0vhw6F6TL/V7u/TuxYBhHje VH7eoZWY2jTEONlxgpBrg9x/z0qwU7vEWcpv/U8XJ2jRYu7Aeem5oiwEBwvKJbrXfVh2bh MDulQbqlGe49xdl4gMQrDJXwHZE6iYK7syiNxFBfy9ZXPJNtmMflXdcTZLH1Gw== 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 E981327DDC; Fri, 20 May 2022 00:21:02 +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 24K0L2jW071908; Fri, 20 May 2022 00:21:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24K0L2Ct071907; Fri, 20 May 2022 00:21:02 GMT (envelope-from git) Date: Fri, 20 May 2022 00:21:02 GMT Message-Id: <202205200021.24K0L2Ct071907@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: c6960a68817c - stable/13 - pbio: Axe bus_space tag/handle using bus_read/write_1 instead. 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: c6960a68817cc124e3c4ead10850f5a2e4f517e2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653006063; 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=eCO3hZikSpvWWQB1vBnKuY0e1gJvJWBi/uYqJ/hi7rE=; b=oEzgcdEUsvjFQhet8Q95hyQP1IHOb3wWy68zARHSwb0Y8LM9DzxBNx6/O4rvPwAtAZBn2l o1IyUy96IQyO0PCpEtQ7hDkZpqfUO0mfgtb7+/HklySzbKS23CU4s7AV/gdjXvzHq2nNMl 0t5Uj47PuKLRbeQhDmJc3CgGym2q4BM5fHO6BgmrC0rNs1Wrmblv/SkBr6W8c/TH4kUnUv UxXAJk2SpledJUBpRAf+BHUBXIr617U20IJfmP+M4sQFXwavopDDRM0xhmYBsj4iHw1Fs8 Y/yxFo1h3kzmHSGLeoesAd7n2GLnxSHkyOzLRW9LcMnGtMzcT4zGz6r8Rx/rUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653006063; a=rsa-sha256; cv=none; b=abNVbbGCo8fcMiTMGpWQqJV+p3ILOZVDC/Bk8kWHNdkC8EEOLemVxZ3vP/TBwllpt4Ezqb yJeAT82ZUCnGDLzi2Ka5SbtbwfWjkDX6cy6pbjdD9skehc5HZ6qFzdCUEMVEAShHWQpPoG QIZQYHBMBGyLht3J5gX4SbWSc36OoExH8uoOzdPgeC04hAm/DqVj0x69HwZfimZg1JeI75 0v2Mqazwg96Ar7hp8o492ZbP9KzerkYUrL3wlVTGhg4PpoQtV47dr/8AzIWPiLgjWRyox6 a8XmLUm6JD6HM9t/AQykUHQ6OIAyRbu7LmUKHDFtemlKCWJInFJEkiRQDSqa9A== 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=c6960a68817cc124e3c4ead10850f5a2e4f517e2 commit c6960a68817cc124e3c4ead10850f5a2e4f517e2 Author: John Baldwin AuthorDate: 2022-05-05 23:38:51 +0000 Commit: John Baldwin CommitDate: 2022-05-19 22:01:50 +0000 pbio: Axe bus_space tag/handle using bus_read/write_1 instead. Differential Revision: https://reviews.freebsd.org/D35079 (cherry picked from commit bb81a138c36aad8359e3599b14b46817ea00e16a) --- sys/dev/pbio/pbio.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/dev/pbio/pbio.c b/sys/dev/pbio/pbio.c index 042a92e39f42..837b419e298c 100644 --- a/sys/dev/pbio/pbio.c +++ b/sys/dev/pbio/pbio.c @@ -117,8 +117,6 @@ struct pbio_softc { int iomode; /* Virtualized I/O mode port value */ /* The real port is write-only */ struct resource *res; - bus_space_tag_t bst; - bus_space_handle_t bsh; }; typedef struct pbio_softc *sc_p; @@ -146,14 +144,14 @@ static __inline uint8_t pbinb(struct pbio_softc *scp, int off) { - return bus_space_read_1(scp->bst, scp->bsh, off); + return (bus_read_1(scp->res, off)); } static __inline void pboutb(struct pbio_softc *scp, int off, uint8_t val) { - bus_space_write_1(scp->bst, scp->bsh, off, val); + bus_write_1(scp->res, off, val); } static int @@ -174,8 +172,6 @@ pbioprobe(device_t dev) return (ENXIO); #ifdef GENERIC_PBIO_PROBE - scp->bst = rman_get_bustag(scp->res); - scp->bsh = rman_get_bushandle(scp->res); /* * try see if the device is there. * This probe works only if the device has no I/O attached to it @@ -228,8 +224,6 @@ pbioattach (device_t dev) IO_PBIOSIZE, RF_ACTIVE); if (sc->res == NULL) return (ENXIO); - sc->bst = rman_get_bustag(sc->res); - sc->bsh = rman_get_bushandle(sc->res); /* * Store whatever seems wise.