From nobody Sun Oct 02 04:30:05 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 4Mg9xB1y1Kz4dtQ7; Sun, 2 Oct 2022 04:30:06 +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 4Mg9xB1HwYz46fB; Sun, 2 Oct 2022 04:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664685006; 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=L9Sm/4j7ZdpjqtU3BTWZQMk6bjkgGUWYcxX3qukpzx0=; b=GEgcVdty7doaNGMGj6D1kysN5v5ZOx9ptZMIcFYmjjI7BivhuDs6Dgvr3L9fbJaUECKDOm eXBn0LPR5uQiRi8YQxpCVZbAuHJvyWz4DtOfDQbFbcQsyiLKgc9/v4UVGXYpugVd3Mnrcn 5VSoGh9tuRrIHwL/+2fYzP4hW0qMN7Pwsxikn4zWdzOAvWf8eV3noCfeSK1syddlGcYC8x fgjvtiknV8pwMKu28WYLK+iJb9KfsBfRXQczH20/ociBJPQfpNZbAYRpKTa/Qqq36wssb2 N3TXxopIbE08Eg1yip/oBQgrPCbJMLFnyozcSfRld1L6yf9l+VtxYiTD6wZR2g== 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 4Mg9xB0NpszlfB; Sun, 2 Oct 2022 04:30:06 +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 2924U5qJ061496; Sun, 2 Oct 2022 04:30:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924U5pN061493; Sun, 2 Oct 2022 04:30:05 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:30:05 GMT Message-Id: <202210020430.2924U5pN061493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: b3ace70370e4 - stable/13 - xl_attach: eliminate write only variable unit 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/stable/13 X-Git-Reftype: branch X-Git-Commit: b3ace70370e45876e7580724515f6e23f8f9807e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664685006; 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=L9Sm/4j7ZdpjqtU3BTWZQMk6bjkgGUWYcxX3qukpzx0=; b=RtIwCNuBMa8wVOYXnYWwQFFeixBqdG6NMdYc/PPhKdvabmlCVAive4E605VaJbz5J3XwaA jVsM/AH0gOuef2xFO7da6PEA21kHYJBMAVHeXDdvGv4YUe8DLujDpMo7eEvOzlSvgTArSd MLKaadxulU9feSYkp5hL6jbv8m+orAkaiHx5T9KVlM73fV6IhcHH86ltnyVnVGHN8mk7Dv 8gJu5EqBO40hZe+qbgZXUJsvHQ7OxZi8vusZfnN0IJvxtUXYwe2zKkhGjf28rsoJ4DwvP9 GR1bTrI+A4n34R/eHtvygNPYQnondBVzzAQrOhKRIWrjEe9tJnsragt3/KDnDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664685006; a=rsa-sha256; cv=none; b=K7gS+xk/jWW777RAT0IwjWF1WX9tCeWPc5QKdcwVjVUGWgkAqWLD7fcjuMsvA9H2/iBZ2I RD3OUzuvNNNs+Cgeox3rpQ1epSihzRjHrY6armVCRfhLx4wtUTS+EdRUjjbCK58XSeUI5U lsfEewd9qwzGZOLHNbuUElEYR54+R36qP6bdEKxP/hoTCAvJvj732bUBqpclrhiPcjjxSr aEUCm+CmfMxBqqOestOyyU60qFJn1Co+V69AsTqvTutvvXfigYHP8hNj3bkE01BXNkGnf7 26bGeXdOCR79D2rRfHysyZCK5Hkxr29yI79C9AcbmriJCyap3+Aoucm0lf5Qeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b3ace70370e45876e7580724515f6e23f8f9807e commit b3ace70370e45876e7580724515f6e23f8f9807e Author: Warner Losh AuthorDate: 2022-07-08 17:53:34 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:56 +0000 xl_attach: eliminate write only variable unit Sponsored by: Netflix (cherry picked from commit c972f2c065bdb7031e7935aac406365e4810df19) --- sys/dev/xl/if_xl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/xl/if_xl.c b/sys/dev/xl/if_xl.c index ca6184758815..ae4d9fb8f5ff 100644 --- a/sys/dev/xl/if_xl.c +++ b/sys/dev/xl/if_xl.c @@ -1069,14 +1069,12 @@ xl_attach(device_t dev) struct xl_softc *sc; struct ifnet *ifp; int media, pmcap; - int error = 0, phy, rid, res, unit; + int error = 0, phy, rid, res; uint16_t did; sc = device_get_softc(dev); sc->xl_dev = dev; - unit = device_get_unit(dev); - mtx_init(&sc->xl_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); ifmedia_init(&sc->ifmedia, 0, xl_ifmedia_upd, xl_ifmedia_sts);