From nobody Mon Mar 7 13:29:51 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 B1E6D19F6DC6; Mon, 7 Mar 2022 13:29:52 +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 4KBzpS3Tygz4p05; Mon, 7 Mar 2022 13:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646659792; 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=EtVoS/I6rBjwOzMx26GsGB2hfD+ZpC6w26DEMcpBsDk=; b=xiMHDi9sVpRzmw6VDCj97I4y3eEQVYP/laTrgHMZbBSYtGDIRZBxUpUPrUOUshC1K8X6KB 6XkTdhkxHQgd+mqpqifLFmVZH4mSNrvH3WiEfmmt0img/ja3b8aHhNuNjfl63Ds+eC6JkC qhGtuM1Xj9Fck6riBEl2ZCc8jByZolVPdGm8EnSEo7FGkBOg4AYqhPm9w+FYGn6eXEJzpg Y0oEdU8Y3MXR5a+4aWxv4DMndRiufQ0/fZCyQS6s12hK5bTOGV7Qoy6Ap1jAAAY2gx2ETR LEZOLpHv29xZ8o5s+Ostnd0uJXYsKMhM9VRBaaQaGnRkrvlt5hKC/xVcu9sc+A== 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 DF238113F; Mon, 7 Mar 2022 13:29:51 +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 227DTpwP060209; Mon, 7 Mar 2022 13:29:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227DTpQe060208; Mon, 7 Mar 2022 13:29:51 GMT (envelope-from git) Date: Mon, 7 Mar 2022 13:29:51 GMT Message-Id: <202203071329.227DTpQe060208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 181c3bf56801 - stable/13 - bhnd: Fix some -Wunused-but-set-variable warnings 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 181c3bf568017270f9f21151285baf3ca17b2ac9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646659792; 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=EtVoS/I6rBjwOzMx26GsGB2hfD+ZpC6w26DEMcpBsDk=; b=oiONu5qTgCv3WsjZ7g3a5vjwUu6SQ2kiz+zIXZLLpbXBTwwb1j3b8klrYJflczC9IpOjx3 t0ZVRnAwXXglSdEXSIqJj0Fq8/rhH8gldvQWSND4mDL+LQ6xuwrzgpB9kUqfns5jznfgcy k9FCmsf6fn2GX/yYNYcbYb+Jbr6DkromrtnvDpBSz3WZla9easDyOSWSlTkPPibe3gm503 begubik8zI2pqEh8YqofeKZI8uEV+4kIud2dahw5xzrsEu/Xlj+LOPKMo8BmTY7TBoMR5a hN+j2c9hUFaQV/Fb7NiPhpyCLpgDYAahHIlgz32p56ZYY/CO86+9WJmaL6HKpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646659792; a=rsa-sha256; cv=none; b=imTe98Q9+SurWjPNnT1Z1BSSNePWAkQxoic0jW0HkDSXuI3zG8ZlvwZRl+qqf7XrQTYLWE x7kSPclMp4tZF5xIOagRtnCJfhCR6SNGuEzQTLbo3RMJ4+Hym5ciC3Zg0vvEXRyscCDJ4g lf+9dTpdF2fOFk9ElHeUoVQ8qLcAeBbOMoV0Q76PKcle6vsvjKvqdwfYyEwlaeRTZUUf4Z DmVDj3pioWHRoO16IDfXQGo9Bz6nTCfLn7M6IbTxEC6aII1W4RbrkzfZeJgw3SUNehewcd t7GOA8KSibtoX/HPNR8w4q+VpHjIEduWlTmNwpitNLqIrPdtKDmZ8dquxZ3a0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=181c3bf568017270f9f21151285baf3ca17b2ac9 commit 181c3bf568017270f9f21151285baf3ca17b2ac9 Author: Mark Johnston AuthorDate: 2022-02-28 15:54:25 +0000 Commit: Mark Johnston CommitDate: 2022-03-07 13:18:25 +0000 bhnd: Fix some -Wunused-but-set-variable warnings (cherry picked from commit 1db163b82565302edebcfde9aee3a77586bccb1f) --- sys/dev/bhnd/bcma/bcma.c | 3 --- sys/dev/bhnd/bhndb/bhndb.c | 6 ------ sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c | 3 --- sys/dev/bhnd/cores/chipc/chipc.c | 3 --- sys/dev/bhnd/siba/siba.c | 3 --- 5 files changed, 18 deletions(-) diff --git a/sys/dev/bhnd/bcma/bcma.c b/sys/dev/bhnd/bcma/bcma.c index 7b2bc2d59e0f..5ae6db1fbca6 100644 --- a/sys/dev/bhnd/bcma/bcma.c +++ b/sys/dev/bhnd/bcma/bcma.c @@ -120,11 +120,8 @@ bcma_add_child(device_t dev, u_int order, const char *name, int unit) static void bcma_child_deleted(device_t dev, device_t child) { - struct bhnd_softc *sc; struct bcma_devinfo *dinfo; - sc = device_get_softc(dev); - /* Call required bhnd(4) implementation */ bhnd_generic_child_deleted(dev, child); diff --git a/sys/dev/bhnd/bhndb/bhndb.c b/sys/dev/bhnd/bhndb/bhndb.c index c90ed9abf671..7a4063238e29 100644 --- a/sys/dev/bhnd/bhndb/bhndb.c +++ b/sys/dev/bhnd/bhndb/bhndb.c @@ -145,12 +145,9 @@ bhndb_probe_nomatch(device_t dev, device_t child) static int bhndb_print_child(device_t dev, device_t child) { - struct bhndb_softc *sc; struct resource_list *rl; int retval = 0; - sc = device_get_softc(dev); - retval += bus_print_child_header(dev, child); rl = BUS_GET_RESOURCE_LIST(dev, child); @@ -1902,12 +1899,9 @@ bhndb_bus_barrier(device_t dev, device_t child, struct bhnd_resource *r, static int bhndb_bhnd_map_intr(device_t dev, device_t child, u_int intr, rman_res_t *irq) { - struct bhndb_softc *sc; u_int ivec; int error; - sc = device_get_softc(dev); - /* Is the intr valid? */ if (intr >= bhnd_get_intr_count(child)) return (EINVAL); diff --git a/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c b/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c index 14ee0385cf5e..d04702c10f97 100644 --- a/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c +++ b/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); static int bhnd_pmu_chipc_probe(device_t dev) { - struct bhnd_pmu_softc *sc; struct chipc_caps *ccaps; struct chipc_softc *chipc_sc; device_t chipc; @@ -70,8 +69,6 @@ bhnd_pmu_chipc_probe(device_t dev) uint32_t pcaps; uint8_t rev; - sc = device_get_softc(dev); - /* Look for chipc parent */ chipc = device_get_parent(dev); if (device_get_devclass(chipc) != devclass_find("bhnd_chipc")) diff --git a/sys/dev/bhnd/cores/chipc/chipc.c b/sys/dev/bhnd/cores/chipc/chipc.c index 1449c3b565dc..f0e3afb486c0 100644 --- a/sys/dev/bhnd/cores/chipc/chipc.c +++ b/sys/dev/bhnd/cores/chipc/chipc.c @@ -621,12 +621,9 @@ chipc_child_location_str(device_t dev, device_t child, char *buf, static device_t chipc_add_child(device_t dev, u_int order, const char *name, int unit) { - struct chipc_softc *sc; struct chipc_devinfo *dinfo; device_t child; - sc = device_get_softc(dev); - child = device_add_child_ordered(dev, order, name, unit); if (child == NULL) return (NULL); diff --git a/sys/dev/bhnd/siba/siba.c b/sys/dev/bhnd/siba/siba.c index 6794412ef760..994f4327b752 100644 --- a/sys/dev/bhnd/siba/siba.c +++ b/sys/dev/bhnd/siba/siba.c @@ -1260,11 +1260,8 @@ siba_add_child(device_t dev, u_int order, const char *name, int unit) static void siba_child_deleted(device_t dev, device_t child) { - struct bhnd_softc *sc; struct siba_devinfo *dinfo; - sc = device_get_softc(dev); - /* Call required bhnd(4) implementation */ bhnd_generic_child_deleted(dev, child);