From nobody Mon Feb 28 16:11:00 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 E1E6C19D9CFF; Mon, 28 Feb 2022 16:11: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 4K6ljc59qLz3DrS; Mon, 28 Feb 2022 16:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646064660; 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=tBSOkOUZ1sNy6cV+Tp7ZKqyQSy/8HoTVgsNElT7wwVU=; b=LcLkXWSMNoK44Yc06DKD6BCoqsaLNAwrlE9tKf/roiaXnnH6Qa5aX6rr5yQ7P2Qw54CTxF gvIJXhuC2CeuBhO2A2Ny1suICjPoz+ltY6lEjIGEYj+ydE++JEFmt/PAiM9HehrIe53PrU QoLuqu2iYPiNPEWcsExW26XHkUNHZeJn9PmqhCxhkvrnzESt9dMB38nFaVWWKuFG53+fbV 8pEV+CNXjsjd422UA+33Y7QjUnmPTSFAPxDV/qO/8AZHEMD2lUIL1Y0/+qvfxEv6+MdytD 7TQQPaGsHJTBYSMmu6RWOSza5Mbd8OBGW3881a49tcIFMEfYavkKRjpvvp9VgQ== 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 8AEC51E6B0; Mon, 28 Feb 2022 16:11:00 +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 21SGB0M8035571; Mon, 28 Feb 2022 16:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SGB0OP035570; Mon, 28 Feb 2022 16:11:00 GMT (envelope-from git) Date: Mon, 28 Feb 2022 16:11:00 GMT Message-Id: <202202281611.21SGB0OP035570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1db163b82565 - main - bhnd: Fix some -Wunused-but-set-variable warnings 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1db163b82565302edebcfde9aee3a77586bccb1f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646064660; 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=tBSOkOUZ1sNy6cV+Tp7ZKqyQSy/8HoTVgsNElT7wwVU=; b=SVCGbehxRqbyx8yJEU91XGSBBa0/j3L+fuutxsEkx1d8U2UScti7vf7DacoqMsFWlvg5oc DUxRkjMUelWncK4DwO0b3eySEbmZpa+EpSMnzQZGYchyGhiKYZ09JcFbnmpLdDizLAkxTN Ebrhc5utx8CRlc7OEc8ZjcghCum9VlAjoqD+kdQL/FmCqAxucU3hWKiEqsmKVoB9a7v1gH yt17gn4p3viTAZ1G9GGYvwE5y7mxKoBdupg6KpfYKUaWSK4JBCKzOXJwDzcRFO077LgzS6 bEvp1jewSvuChE5b1CyrXtS384eQl0T0jUeWsV5vFoswH3WPM11cKj7UfNn7Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646064660; a=rsa-sha256; cv=none; b=D6QRG5kGaqEmssiOwHNvVJSY0wUAyARc6vqVrlPLcCRNQt6r4GOOdEfXT/waL3sgFbr5yP X/SV4AuHuGpURO+7AAns59PHOozKGUNSqS370ebqlIn3KAjc2V2NOT7wQZBfwQmxOLbKyQ Y9qWghCOqrh0lVTtxeuBde/csm8Iip+j7kBYINu28SROGG425ayqzrgTR9y9uH/PWMrRAU G4JdKbhjg+uu6y91o66GKWxPo4Tk8z+2L2usvmsshNqRhCN3umG+u0edvy2IHnO3CypRy4 xtGgINLWsZTEjVOhrKzTTe7JeqStaQYPztQfeYzXNNYXALdmsaJsVxU7qPW4IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1db163b82565302edebcfde9aee3a77586bccb1f commit 1db163b82565302edebcfde9aee3a77586bccb1f Author: Mark Johnston AuthorDate: 2022-02-28 15:54:25 +0000 Commit: Mark Johnston CommitDate: 2022-02-28 15:54:25 +0000 bhnd: Fix some -Wunused-but-set-variable warnings MFC after: 1 week --- 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 9a2beb50e9bb..323972f5585c 100644 --- a/sys/dev/bhnd/bhndb/bhndb.c +++ b/sys/dev/bhnd/bhndb/bhndb.c @@ -146,12 +146,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); @@ -1894,12 +1891,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 72d92ba682bc..7f74edf6b3fe 100644 --- a/sys/dev/bhnd/cores/chipc/chipc.c +++ b/sys/dev/bhnd/cores/chipc/chipc.c @@ -599,12 +599,9 @@ chipc_print_child(device_t dev, device_t child) 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);