From nobody Mon Mar 07 13:29:48 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 AC8A319F6F0E; Mon, 7 Mar 2022 13:29:48 +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 4KBzpN4GNTz4pLP; Mon, 7 Mar 2022 13:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646659788; 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=gCUkhayeIfSPBAXTXJqQfXue01xqgPhGd7yL0l7Rb30=; b=XPbkYWisu0KCCTBR64Wxg/zZDeftrJQpKuKqZGqG4+Npsq6ylK8vIsW6ofysEgQWBBuiYz trInnGEUg8bMN+hgsc0YGyoTYBhpGkDiDnTGHGxM7ihNPD9Nc/wqgjXSRdgidEsDH7AaNi kKo+o3hNWaWkTQusmWWp30CHrZLy61MWVHJahMZyYVBmpOhT1aILwLtSgEgWU+62s3a1mp PvNqpRAhf6bz5AP2jNe7gzqQR8IZWXK0G193Ux6JBLxVbKEakTC1ynZeAjv/I5lZ4jJI3L PDfHhmvSJvITtnqBWjY8yflQYGV7BCdfEq4vllPZMsWtZYIeYc1WNh1nnR/+1A== 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 72D23FF2; Mon, 7 Mar 2022 13:29:48 +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 227DTmuK060137; Mon, 7 Mar 2022 13:29:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227DTmXe060136; Mon, 7 Mar 2022 13:29:48 GMT (envelope-from git) Date: Mon, 7 Mar 2022 13:29:48 GMT Message-Id: <202203071329.227DTmXe060136@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: 29e0af110aa2 - stable/13 - iwm: Fix -Wunused-but-set-variable warnings 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 29e0af110aa2907cf95f7f97d288899d95a402bc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646659788; 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=gCUkhayeIfSPBAXTXJqQfXue01xqgPhGd7yL0l7Rb30=; b=WThJd094loaFjuVxQVAkws+LpvPmFdSJqzYDQnI6i4vQ7yfELa+cmp7dj8QlMSAumtsDiR U3ufKc+iYe7Lzux33P44W9ePBTs3zi8ya8sYNtzsqlIV6P3Io8Mkz4TwWtqtz/NP0W1WFY rFJrg4biRlv0ypkHSMKGEB63SVc1nnxhaI6WAxlWzpZal5u7Izj3/jSnX3pr2TZgOZB20+ Wokt6xyltUH0G1fNFFZ6EQ0llAcLXCSL40XqKlVDw7YqNfE5qK+4sngG5UQcuuw4fmAkux qPQOcLWqWkQKmHC+Vps60UBrVXy3l5qCaQsMvYW7jlR4TrKSFPmAg+UfnvtNuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646659788; a=rsa-sha256; cv=none; b=d9rKGK8SSz60LCa7UOf2GX3oZ+9bPfDcCP+BmZW53JaCyW1qvKv8oU3Ea1rjIPiUNhvjwB NpjxXz5mryJsu5ztidegWcozD3PTFxbs3h2F/xQobKkW7XCHKbs9FBD2V1LnmazrZUzPTv G6TqCODo/EH5RYQuMMwgeKQ1p2B7z+Fg15L1eEVbNqDwDh83Sx1oqcPlQnMN0PzQENZuy1 maV9vN73pgDQJNvHRph2taF2KblbMGb8pisJDC9OP3aL4KGHV95FrY/VRE4PChGA3+iZvD r6WxxjLPMiPQqU4fh3BKxRSuUSUQO1JRFRXylydi1O8zA51NFv1Mdj+lmwssVA== 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=29e0af110aa2907cf95f7f97d288899d95a402bc commit 29e0af110aa2907cf95f7f97d288899d95a402bc Author: Mark Johnston AuthorDate: 2022-02-28 15:54:15 +0000 Commit: Mark Johnston CommitDate: 2022-03-07 13:17:47 +0000 iwm: Fix -Wunused-but-set-variable warnings (cherry picked from commit 1dc8ed06f37a0d5ff4b78791885d7ba6dd3e407b) --- sys/dev/iwm/if_iwm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index f994e8e75307..7310927904cc 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -5719,7 +5719,7 @@ iwm_intr(void *arg) { struct iwm_softc *sc = arg; int handled = 0; - int r1, r2, rv = 0; + int r1, r2; int isperiodic = 0; IWM_LOCK(sc); @@ -5811,7 +5811,6 @@ iwm_intr(void *arg) handled |= IWM_CSR_INT_BIT_HW_ERR; device_printf(sc->sc_dev, "hardware error, stopping device\n"); iwm_stop(sc); - rv = 1; goto out; } @@ -5856,8 +5855,6 @@ iwm_intr(void *arg) if (__predict_false(r1 & ~handled)) IWM_DPRINTF(sc, IWM_DEBUG_INTR, "%s: unhandled interrupts: %x\n", __func__, r1); - rv = 1; - out_ena: iwm_restore_interrupts(sc); out: @@ -5992,9 +5989,9 @@ iwm_pci_attach(device_t dev) } error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE, NULL, iwm_intr, sc, &sc->sc_ih); - if (sc->sc_ih == NULL) { + if (error != 0) { device_printf(dev, "can't establish interrupt"); - return (ENXIO); + return (error); } sc->sc_dmat = bus_get_dma_tag(sc->sc_dev);