From nobody Fri Apr 8 00:03: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 43D921A889DF; Fri, 8 Apr 2022 00:03:58 +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 4KZJPp2HmGz4lNV; Fri, 8 Apr 2022 00:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376238; 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=KuzYjVsXusWsi7F3MxjLUGRdqkhV1GafgN1qlb2hpb4=; b=r22spl6PlODACeEh6gLv+wh4Hs9KiyaI42MD/Vv6Q/wz+2QvH36k1joYlXxav+mSNV6u9I GX1NW15FTidM05kUkd6i+Wdl2nhF40u/RwR36f9Vt9OpS3i3FM76BlordaEfYQCuQPiY0T ipHBLy2tTZThrzQvTurMTwIGj5zFvA/EHvzydleGR+sc2/NmaMXn7g7eZvumWVDWvEJPfz bMYjPwpMfgJ1PFvQ7PufMJLSOwmV+pebO5hmkyxXbvpBCyVMomTL/ZM/4lj6kxuok5N24f 72jW+njlA4aNYbalIXWLsnE+D1qQ5vISIpvX16APjczn9P4sfKvqaIKgWACYPg== 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 1EB101A344; Fri, 8 Apr 2022 00:03: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 23803w5E087046; Fri, 8 Apr 2022 00:03:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23803weS087045; Fri, 8 Apr 2022 00:03:58 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:03:58 GMT Message-Id: <202204080003.23803weS087045@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: 7295403595d1 - main - if_urtw: Remove unused variables. 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: 7295403595d1e720bd41d2440b2aa4149f294b17 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376238; 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=KuzYjVsXusWsi7F3MxjLUGRdqkhV1GafgN1qlb2hpb4=; b=tMmrZsokR8W4j7lNJV0gmu+x/ptCfDmYHpHqd88SatFtcU2TG5EsZ2bLmoWu9BiI9gleXe Z16M6SNor/q6dnkapDzr2o7WzI4nSaNPMNmgPhZx0Nbtzk2wvxheU9fErgo2Iw/RMnQQg2 jsG8ixOFTJ0U3zG38ygmuKXrJF+SLbpxjyINAOt608uNJPRAHxNRhdwBEAUzB+hbWdYWQ7 NEAJm99Vvz0Kh9TRuwHR1U2raMqdf+iAXtO/R7Ppyt6JKmlDJzY86X3iDxcPB4oc6P9tsL 9bTnjx+kgmtX8hEGf2NypsgLRR/aLdgjoPpZu0m+99+4b1ZjWuuGhnqUDFNSSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376238; a=rsa-sha256; cv=none; b=ill+geM50m0Ufynf7h8IR2h5K7AZuPym/sgK0KrUidmS5LQ20IOmWOA++daWNtsaq7j4pB HuNyQFRnWvqinDTPBQX+xY75BZFnPLRbuKdjJWplYz4A/usdBbriyGsZWxxvA8lC6PzvnH 0XwhfJGDUEcCv9mV81kx7xPwPCY83vU0g3KPPEsGLeoOfYWJ4EgXcmGAwoJbDn0fgB5cdQ CxeN/e8wIvCfltnAjf/XLsLmg6BxAjG/zrT8JZdP327Gl8ltK/4fL5m3XDuDsHo0sxW8l4 SpnFKgpa7s+PMrmF6o92cIqgmfLsYASp6Z6Y88xYa0K63LV5dS1sdIswWoOVpg== 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=7295403595d1e720bd41d2440b2aa4149f294b17 commit 7295403595d1e720bd41d2440b2aa4149f294b17 Author: John Baldwin AuthorDate: 2022-04-08 00:01:29 +0000 Commit: John Baldwin CommitDate: 2022-04-08 00:01:29 +0000 if_urtw: Remove unused variables. --- sys/dev/usb/wlan/if_urtw.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c index 0ee538ffbe43..164436daa21b 100644 --- a/sys/dev/usb/wlan/if_urtw.c +++ b/sys/dev/usb/wlan/if_urtw.c @@ -3775,12 +3775,11 @@ static usb_error_t urtw_led_blink(struct urtw_softc *sc) { uint8_t ing = 0; - usb_error_t error; if (sc->sc_gpio_blinkstate == URTW_LED_ON) - error = urtw_led_on(sc, URTW_LED_GPIO); + urtw_led_on(sc, URTW_LED_GPIO); else - error = urtw_led_off(sc, URTW_LED_GPIO); + urtw_led_off(sc, URTW_LED_GPIO); sc->sc_gpio_blinktime--; if (sc->sc_gpio_blinktime == 0) ing = 1; @@ -3793,10 +3792,10 @@ urtw_led_blink(struct urtw_softc *sc) if (ing == 1) { if (sc->sc_gpio_ledstate == URTW_LED_ON && sc->sc_gpio_ledon == 0) - error = urtw_led_on(sc, URTW_LED_GPIO); + urtw_led_on(sc, URTW_LED_GPIO); else if (sc->sc_gpio_ledstate == URTW_LED_OFF && sc->sc_gpio_ledon == 1) - error = urtw_led_off(sc, URTW_LED_GPIO); + urtw_led_off(sc, URTW_LED_GPIO); sc->sc_gpio_blinktime = 0; sc->sc_gpio_ledinprogress = 0; @@ -4117,7 +4116,7 @@ urtw_txstatus_eof(struct usb_xfer *xfer) { struct urtw_softc *sc = usbd_xfer_softc(xfer); struct ieee80211com *ic = &sc->sc_ic; - int actlen, type, pktretry, seq; + int actlen, type, pktretry; uint64_t val; usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); @@ -4129,11 +4128,10 @@ urtw_txstatus_eof(struct usb_xfer *xfer) type = (val >> 30) & 0x3; if (type == URTW_STATUS_TYPE_TXCLOSE) { pktretry = val & 0xff; - seq = (val >> 16) & 0xff; if (pktretry == URTW_TX_MAXRETRY) counter_u64_add(ic->ic_oerrors, 1); DPRINTF(sc, URTW_DEBUG_TXSTATUS, "pktretry %d seq %#x\n", - pktretry, seq); + pktretry, (val >> 16) & 0xff); } }