From nobody Tue Apr 5 04:32:54 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 354041A92D8A; Tue, 5 Apr 2022 04:32:55 +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 4KXZWV4G93z4gWS; Tue, 5 Apr 2022 04:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649133174; 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=QwkATehE8vCpllsqWM0Cq5WxYhh7FIZcnrHeoYGgLPc=; b=B59LZ96NeIdLHzXaAwyRcYdywOGwxSfP63j8csy7ABGDj1tJGNHmM/odP2Uh8hMAPH7tSc No7MJso+3munVN4Ylm+WOWdxy1gIG4E+0hjven+yoixBcHu24qiroi6SfQtH3U561mRrfW XG800g6eXWIP8PDHJq7oUgEtxIaQVJ0R3MoTd38Ozz63zUPS57vK7yLRJSoN56D9iDMstt Hhagok7/RCAHqHO+IS8IuHKl94J/a7nOUJJSt7edfGY6v7NyQMJWufpFo/1+pV2CMxaSIQ pJW1BhsHhx8Tne6Uqb1NP2VUKlxXnCR9OjEuFRHY5lEEPSYQVp+AGmh10gLUAw== 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 6C73D1FEDF; Tue, 5 Apr 2022 04:32:54 +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 2354Wsn8009615; Tue, 5 Apr 2022 04:32:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2354WsbM009614; Tue, 5 Apr 2022 04:32:54 GMT (envelope-from git) Date: Tue, 5 Apr 2022 04:32:54 GMT Message-Id: <202204050432.2354WsbM009614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f7097359c866 - main - mgue: eliminate write only variables ret, err and error 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7097359c8660351ca162eef19db7eae28cfb327 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649133174; 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=QwkATehE8vCpllsqWM0Cq5WxYhh7FIZcnrHeoYGgLPc=; b=fcMnoODJpD0W9+aYXxa5rXnH6IdOY4P48U9qiaTqKn77MKnKg9nVUI32dIAABzqGMsLOlm mWRRwacWEVW1cD9gB83LpcF7170i9hq6rICAM89rKPQ7Nd2AWfTPkBBSxZnqH6pfdOuqV0 j58Pjd/uNWe9MITzDi/FjScGGqcB3ikvSHSfBaFK0kXgTLAq1eWcCG+Yaaz+tHZ0A06XkJ bw7kckGkO8rU46x2rYHQMlBAENKkRdPkKF11RMqufUEzKao1jIlcK/4mklPa6gBxEc06Ps gkviIN9hGxLBlHFCEm3umhXxr2S3Od2gdp7A66woFi8mEFpcRyzJLUHcTQstxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649133174; a=rsa-sha256; cv=none; b=r8CddV3O65iSuW/HwBs9N/Ix+CXM8wKD/mE+i4LhNRGZYEzSvT+WfDBwIYLCEqufcXMyiu jSWl0MVVlxrPLfj9Mvo2vTQSjpEsR3o3dJT0es3qqwyXgw+0H5NOl/hskpBcBrKHP9L+ss udEE8LyiVXIygFEZS9LJdz+5g1jpgkTnAxDMo3f3Lr5771l/LIqeHPSVstF45SNfbsfawA paF+ZOfcAauOHAFmRxwnoBGyxTibhsTFCgpOWcsZ1zG4jncJoOUrNYGWDOVVnGxibPEeKx dnjTDu4NL8dXrPhCcHfude6EPiWpWmo+jJ0vkngnJsyYwC4PkA+y7GEqP3ia5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f7097359c8660351ca162eef19db7eae28cfb327 commit f7097359c8660351ca162eef19db7eae28cfb327 Author: Warner Losh AuthorDate: 2022-04-05 02:31:06 +0000 Commit: Warner Losh CommitDate: 2022-04-05 04:30:38 +0000 mgue: eliminate write only variables ret, err and error Sponsored by: Netflix --- sys/dev/usb/net/if_muge.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/sys/dev/usb/net/if_muge.c b/sys/dev/usb/net/if_muge.c index cf2420875e72..e7e21112ece6 100644 --- a/sys/dev/usb/net/if_muge.c +++ b/sys/dev/usb/net/if_muge.c @@ -614,30 +614,29 @@ done: static int lan78xx_set_rx_max_frame_length(struct muge_softc *sc, int size) { - int err = 0; uint32_t buf; bool rxenabled; /* First we have to disable rx before changing the length. */ - err = lan78xx_read_reg(sc, ETH_MAC_RX, &buf); + lan78xx_read_reg(sc, ETH_MAC_RX, &buf); rxenabled = ((buf & ETH_MAC_RX_EN_) != 0); if (rxenabled) { buf &= ~ETH_MAC_RX_EN_; - err = lan78xx_write_reg(sc, ETH_MAC_RX, buf); + lan78xx_write_reg(sc, ETH_MAC_RX, buf); } /* Setting max frame length. */ buf &= ~ETH_MAC_RX_MAX_FR_SIZE_MASK_; buf |= (((size + 4) << ETH_MAC_RX_MAX_FR_SIZE_SHIFT_) & ETH_MAC_RX_MAX_FR_SIZE_MASK_); - err = lan78xx_write_reg(sc, ETH_MAC_RX, buf); + lan78xx_write_reg(sc, ETH_MAC_RX, buf); /* If it were enabled before, we enable it back. */ if (rxenabled) { buf |= ETH_MAC_RX_EN_; - err = lan78xx_write_reg(sc, ETH_MAC_RX, buf); + lan78xx_write_reg(sc, ETH_MAC_RX, buf); } return (0); @@ -1265,8 +1264,6 @@ muge_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) */ if ((ifp->if_capenable & IFCAP_RXCSUM) && !(rx_cmd_a & RX_CMD_A_ICSM_)) { - struct ether_header *eh; - eh = mtod(m, struct ether_header *); /* * Remove the extra 2 bytes of the csum * @@ -1596,7 +1593,6 @@ muge_attach_post_sub(struct usb_ether *ue) { struct muge_softc *sc; struct ifnet *ifp; - int error; sc = uether_getsc(ue); muge_dbg_printf(sc, "Calling muge_attach_post_sub.\n"); @@ -1639,7 +1635,7 @@ muge_attach_post_sub(struct usb_ether *ue) ifp->if_capenable = ifp->if_capabilities; bus_topo_lock(); - error = mii_attach(ue->ue_dev, &ue->ue_miibus, ifp, uether_ifmedia_upd, + mii_attach(ue->ue_dev, &ue->ue_miibus, ifp, uether_ifmedia_upd, ue->ue_methods->ue_mii_sts, BMSR_DEFCAPMASK, sc->sc_phyno, MII_OFFSET_ANY, 0); bus_topo_unlock(); @@ -1827,16 +1823,16 @@ done: static void muge_multicast_write(struct muge_softc *sc) { - int i, ret; + int i; lan78xx_dataport_write(sc, ETH_DP_SEL_RSEL_VLAN_DA_, ETH_DP_SEL_VHF_VLAN_LEN, ETH_DP_SEL_VHF_HASH_LEN, sc->sc_mchash_table); for (i = 1; i < MUGE_NUM_PFILTER_ADDRS_; i++) { - ret = lan78xx_write_reg(sc, PFILTER_HI(i), 0); - ret = lan78xx_write_reg(sc, PFILTER_LO(i), + lan78xx_write_reg(sc, PFILTER_HI(i), 0); + lan78xx_write_reg(sc, PFILTER_LO(i), sc->sc_pfilter_table[i][1]); - ret = lan78xx_write_reg(sc, PFILTER_HI(i), + lan78xx_write_reg(sc, PFILTER_HI(i), sc->sc_pfilter_table[i][0]); } }