From nobody Mon Feb 28 16:10:59 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 8D72B19D9CF7; Mon, 28 Feb 2022 16:10:59 +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 4K6ljb3dcRz3F4s; Mon, 28 Feb 2022 16:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646064659; 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=VcBgAdV5baq5YNGNkrooFVjMtsIz+SU/2dD4KwIOZ1I=; b=v1gTt2XacYOq0P1kC1r6IF6e4H51FopkpwFz+jsTlGYVcSsSLi2tnIoX5FlQYuPTAsmPt3 xxrYHiXLwJQqzIvEv6d756TrRh4rCCaV9QdRNZluu2Ke1UqSqd5dOkOnjjSpxs2+jLW9/u AHfXg6mSwXZvQAU6KzuvQLCaZ+z4GguJKq6ObzT88rGID769XabFjBu4O7sWHr3PUeRVeg Ya4qo9j8GGAr3MTs/NoElpeYYmA7reuITKhjD0dK5jnpwSbnD90UsYsrbuPwoC6jxR7ood DIZiS5hCIF/kb/LB9qs3RMlMTxtKd6hUFICi8nqxv8K0WyaKYT0/VYv5T/QZLg== 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 5D09C1E651; Mon, 28 Feb 2022 16:10:59 +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 21SGAx5C035528; Mon, 28 Feb 2022 16:10:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SGAxn4035527; Mon, 28 Feb 2022 16:10:59 GMT (envelope-from git) Date: Mon, 28 Feb 2022 16:10:59 GMT Message-Id: <202202281610.21SGAxn4035527@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: 1dc8ed06f37a - main - iwm: Fix -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: 1dc8ed06f37a0d5ff4b78791885d7ba6dd3e407b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646064659; 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=VcBgAdV5baq5YNGNkrooFVjMtsIz+SU/2dD4KwIOZ1I=; b=tI++5EjgzVPhqXlbI4hKuQwVRhCVWl+1G9Y++k3iCokqBeUGxp/pIQCMMmvb6IvBLpJhKO VHGtwyEy6teXveqFxyoXeAJd5Eg8VhvEb+39mID5mdFd5ab5yaO6oi618UkQoaE+Q/14RX CnfJhXQlByEqsEdTXbZ4h7CnRNiaA32mBau92YA79JZh6P7ZDJxxpO/XDShZKYQWinCbHx w7Fu1+LSA40h+r8OS0Cd7Vu5nFGnPjWSCE8riBUhUlNrZWOFNhLcUfeyguTIKum1+Id+x7 qWSBDv08rbyOChL1clI0Ppso9uKwnWpAgYbGWgG//crkrKqDf0yFs7aa3QCYnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646064659; a=rsa-sha256; cv=none; b=SMwyFuVhjeWKUQs0We+1yaHRuJrDavh1wdqqGJn3rDuROCuznM5x96BNvPhiXOShOICfN6 QBupdjSE6QpmA40QfrD+TDpoSu+oguSBUzJHxhXuBCgYEQNSbDqh5lLcnxMXrYW6dnXBoL LuCRm4KpbrTjwU/laGhf4GDAK34HKBOrAlmLg23IEAW3TKlX5PS0XJBsk2bB+CJHghPbVi aj2h+5ev7gmt8wr4e956Ys4/DNt4sDns/rx7V+hiO4kLYXoM/azevlXEfQ854EYDHWKmcX qMR5m9sGXCjfuCJOrFY45hni8x0rpwIODIQNR//KGZtChaXECDSAhe0ayJJGSg== 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=1dc8ed06f37a0d5ff4b78791885d7ba6dd3e407b commit 1dc8ed06f37a0d5ff4b78791885d7ba6dd3e407b Author: Mark Johnston AuthorDate: 2022-02-28 15:54:15 +0000 Commit: Mark Johnston CommitDate: 2022-02-28 15:54:15 +0000 iwm: Fix -Wunused-but-set-variable warnings MFC after: 1 week --- 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 2ddf7caf8b20..439a68da9253 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -5620,7 +5620,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); @@ -5712,7 +5712,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; } @@ -5757,8 +5756,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: @@ -5893,9 +5890,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);