From nobody Wed Apr 06 23:45:58 2022 X-Original-To: dev-commits-src-all@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 F323D1A82A99; Wed, 6 Apr 2022 23:46:00 +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 4KYh3W3Dm5z4Qpj; Wed, 6 Apr 2022 23:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649288759; 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=1M5XLaerWmHXMhy7w6qxqe4HH0rOwI/8yC64CJGa/O0=; b=bDKrQAgFppDnpAz+R2A+eUWOWZQ/cx8Ph7S1sTlS2NGjhiIL9ZUD/yeW8L0Kwlf/Xps1pe V7dvThdmR/FJBASHsgL4Kpd70+cEfPIGe6f026RLK+aC7dgH8CD3BhfOqrXMPXgUCNKN9Q njNebs4DckeuJoR/09e7DRbSu3nhHFFJrUgViDgRMfhMgW71cWbPlGZrRtnVh4ghvLXJbL M1ApMV+si50nEM4fy7KRKKLFXZCkGnsu+jb8QRNH7ytx9Xd4DKmYev9q3MYZJD5lmm3+ym tuWxymzw/+k2XaPbYGGrKwXMZjCD0uagk8gDQkrHto1r/fVzCQG2mFvEP1V9KQ== 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 7341424CAF; Wed, 6 Apr 2022 23:45:58 +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 236NjwiQ008619; Wed, 6 Apr 2022 23:45:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236Njw4a008618; Wed, 6 Apr 2022 23:45:58 GMT (envelope-from git) Date: Wed, 6 Apr 2022 23:45:58 GMT Message-Id: <202204062345.236Njw4a008618@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: 30cac8e3bbc1 - main - ppc: Fix set but not used warnings on !i386. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 30cac8e3bbc12a5ca16f1882af23a64d493cf6ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649288759; 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=1M5XLaerWmHXMhy7w6qxqe4HH0rOwI/8yC64CJGa/O0=; b=v8IyOOm/3NBZFiig7g14IZzHrYqW3afi0poAJPZevdcVCHMOl4uF4H+Z6r5X+oQmxuI0kN cMJ6fCmaAS03NSSZISP3C74EbPjoeBcrFrHYOahg/NG4h0JNJM4nPAsJJuv+4b+Td2+cQd QVK2+qfiOY2AKLrjpHT+8AaEV2BeBMi5cT5Ib3JWWIHcYAeRnwbgYU81ZGsB01+EPeQBln fWA/3hnOcutfg8Jr/jXqHFUJRXe9T0vhK9XSMt3O3ecyiZ0tY5yDnxpAGJQrk+qnEmQfsl VMhTYrHDG2IRyW6okOpopb7ySEfWTISqX8jBxi2WI1vKcDA/Gy9cklHEA+kFlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649288759; a=rsa-sha256; cv=none; b=BHLo/rAuJSxUgVtiJIxQhY1KEHgLMxDG494BU8h1exUSW92mF/c5vgDJ/ZvbGGSFYqBbuC 1gfwZXqmMU1YLkzGI1En12Y04UqqD5m7Yimezlw1x5XsNXksUCfNq+S+Z27cT6k3ljd4oX FAD4ayjD/nw1v8/f5QUuHbqdrjz9qP1WxVtBnANC7fZ83bIS2e5bfAK2M8Y0F8YwgHQefX 51lDezgsVmktA9/YPKTNRSWtGccDbnx5isQSEBN+FheOyHRHtR7JbhW7VgfpRQH8MUUlnN XVU7h7XksRIA+NqAT7JOiOLDdczMtl/bQK1e65paYSGzSx29OyB5zQeV4y4ydA== 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=30cac8e3bbc12a5ca16f1882af23a64d493cf6ce commit 30cac8e3bbc12a5ca16f1882af23a64d493cf6ce Author: John Baldwin AuthorDate: 2022-04-06 23:45:27 +0000 Commit: John Baldwin CommitDate: 2022-04-06 23:45:27 +0000 ppc: Fix set but not used warnings on !i386. Move fetch of SYS_RES_IOPORT resource and associated variables under existing #ifdef __i386__. --- sys/dev/ppc/ppc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c index afc9e4b2dd9f..b452e9007dd4 100644 --- a/sys/dev/ppc/ppc.c +++ b/sys/dev/ppc/ppc.c @@ -1657,12 +1657,12 @@ ppc_setmode(device_t dev, int mode) int ppc_probe(device_t dev, int rid) { + struct ppc_data *ppc; #ifdef __i386__ static short next_bios_ppc = 0; -#endif - struct ppc_data *ppc; int error; rman_res_t port; +#endif /* * Allocate the ppc_data structure. @@ -1672,10 +1672,10 @@ ppc_probe(device_t dev, int rid) ppc->rid_ioport = rid; +#ifdef __i386__ /* retrieve ISA parameters */ error = bus_get_resource(dev, SYS_RES_IOPORT, rid, &port, NULL); -#ifdef __i386__ /* * If port not specified, use bios list. */