From nobody Thu May 05 23:42:29 2022 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 EC5921AC1A42; Thu, 5 May 2022 23:42:29 +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 4KvVc526KFz4Y9v; Thu, 5 May 2022 23:42:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651794149; 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=60Y2AIBc5QUr3/lhrE6gCpe9rLDWg6W12AmI2FM37Uc=; b=J8SA4czO/M6ZbNpCVm1UyFQ/ql/qIqAO4D6/mcuRtfWvkXZSbxnnLt+6r8pVU0Io1y5Gji HKPH9oNLWi1YP/4geEbMB6L1JT83hLhc2ZjpitzWt68b01/ZC0nAuzubkcr3DjAJtEFSyh ssZIJzNM1+agDee6seJ8jwVPgSgih3OVCXRb1s9kH3bx0AFLvyNlb5bTEMoAXseSUCt/XS +rOC9azHEubauGEdqX+Uq5kk89kfy1cCGvZ4YdtvcTXrS3+33nev6tYgiaSE1dipCm6eLt WuTCdIe6ucMKw/pUu30KfDWPU+dLBeocp3mSsL559baKmkRX3skVuyIA21TItA== 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 19E2111341; Thu, 5 May 2022 23:42:29 +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 245NgTjA055678; Thu, 5 May 2022 23:42:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 245NgTnI055677; Thu, 5 May 2022 23:42:29 GMT (envelope-from git) Date: Thu, 5 May 2022 23:42:29 GMT Message-Id: <202205052342.245NgTnI055677@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: bb81a138c36a - main - pbio: Axe bus_space tag/handle using bus_read/write_1 instead. 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: bb81a138c36aad8359e3599b14b46817ea00e16a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651794149; 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=60Y2AIBc5QUr3/lhrE6gCpe9rLDWg6W12AmI2FM37Uc=; b=QDrHEV8nsjWrPz7Wz/CGNRXoofnvuWjg3g99px8cuvPNYH7ZARfrQWM+neF+hEeGQHiYoc AJrZeYkTRGa+sCsa4JZFAh/RWuzoqecmAlRG8y0Ifrl5ZZDJCunDP30i5SQcugGlsUSSn5 LW/MxG7BmCTfLkMAWEjf6Bh57PHf8J/UQ5sqB/NKJg+2dNpIDgWOOt0ekSVxqpaQ8+GYDR ArAIfg228vSXCXVetp8QolFahMMZI7Y2pcKNbxrOLYqdqPZYac/bLDNfaFerr3qRqiT1gF eCaBwAVPsKWpUpSj3fNx/IlKTThd+9M72GMovd0OZ0IL0kzFxOgZuuA4m7BbTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651794149; a=rsa-sha256; cv=none; b=Ur83AJaGiTd3MW+g3nBzWnFb8k/d9cS+uL4YIObEXPpHM1cXtRyzm3cne/kfGlhr/4Oec4 uKhfFp27c4ammZZ2EX/zIHWqsQbZo4W68kLjkuS6XMQGueu3gQzkYduXNvEMUxFtEnCmzw SNfONZhth/op+ufWNs22M5E2p8wAiP5zSGb/YOjo3BEkbOlh53wyUqOy0tMw9j3jfZrLJd cewvxjOjRfels8LHVhlKpliQVILcR7seupBKHXRH1mkEEpYLQcmgRxcBbuZVWLflULHRr4 H2HCvzKxyzSUClgXmrIbwJCjOK01xUI70O8nsUJhcdjQn9hecB5gQhaFkdeEnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bb81a138c36aad8359e3599b14b46817ea00e16a commit bb81a138c36aad8359e3599b14b46817ea00e16a Author: John Baldwin AuthorDate: 2022-05-05 23:38:51 +0000 Commit: John Baldwin CommitDate: 2022-05-05 23:38:51 +0000 pbio: Axe bus_space tag/handle using bus_read/write_1 instead. Differential Revision: https://reviews.freebsd.org/D35079 --- 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.