From nobody Sun Oct 02 04:29:42 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 4Mg9wk5xNbz4dt9s; Sun, 2 Oct 2022 04:29:42 +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 4Mg9wk5VwFz45V8; Sun, 2 Oct 2022 04:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684982; 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=C4xdOaW696JmZzuNOC7UUuA7LX5bSpaX5fkOakabLzI=; b=vHruJKwqsFdQ2m4DB2jvEIAviLIinaP4xaxUqNSRy2mDQ00pgAE+6joO+JeH6+lkeZTcbW ktc1Rx66l0n2L98uPYlxUdp4IYMua1Aj0MZiGYX7g3xOpXloX+s+K9PH+CcUWRVPRsYoLy B1ygHcK/AigZ7FOIaN418MBPBT8MGbHOLbjBc2n/Z4k9i6jBORLCjCke+6CHB2WNQYC/nT whq3EugVh2ZDi+M1NKBsPKubprpeMJjokkGjZN8e2+m0SWr3WKVXAVjJHncN5i9qBryfXY +9veWeqH7xtj8YaurjA0Y2Ux8AzJg/FQ7T7Bzfi17iwnRYuBJIXge5GmM+F2GA== 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 4Mg9wk4c4tzlTZ; Sun, 2 Oct 2022 04:29:42 +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 2924Tgsl058547; Sun, 2 Oct 2022 04:29:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924TgRr058546; Sun, 2 Oct 2022 04:29:42 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:29:42 GMT Message-Id: <202210020429.2924TgRr058546@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: 2a70b66f8983 - stable/13 - sis_attach: Move waittime definition into for loop 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: 2a70b66f8983482e9d7577542436da58617b033e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684982; 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=C4xdOaW696JmZzuNOC7UUuA7LX5bSpaX5fkOakabLzI=; b=Ve2LRjzZWbhOt2afY9h1xu899tn1snNnnnfGQBSLk1Bl3qwQwUkaxEpwZXColvNVZwf2Vm GxF3ztV6nuc1iKVvsv1dkdBzIKnSeQzh2jgmlJjO69xbb+wK6lhkgVxdxssu/wlRj6G1ap 9MDvt9XwVqJmXiibAJ/7+MxBCIEKGnSYrOgbhKQ5ySIsTIu2ycNmLJpEDruTfnajyZIzOi cF48JVqRyBYQOzNyg/H0phOV4Q6IJJTcHZDQ7zm06ZNZa4+cZ7zAin9nrVqXro9pEDcb+O Sqj3gkXDYfCyjyenXsHx1Q5MFM5SHvjzqEOCo/7sOIA1VHzUcxKVYFaF08zKew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664684982; a=rsa-sha256; cv=none; b=IEqMlMYTJ/21UcUw97KEHHtJAXGCOtOTDP96D+cjQMfDWEeHXCnoAIZecuFNmK1B19EgI3 xNQOEuLpWm28WQCUAcjtAymexbNrlf2hUf4vVMnK/IIyUYu/PxzIW8Nd29xlfysh9x3I/j v9fc1S0j4I564plcUWA3SdfA/MuhTJ0jwk+1LXpcqaga2u7A9WMkpblzcSQKAzckDb7p+1 AhwOOzlOuf2hcXygNj5PLOH9lLKXbX6Qs+opcAeGCu+5g8wfBPICj4wm5xRXg/v9MZVLTT PCCIOrRvLCTSd75imgy6r75+PZWFVOJuv1crEckVinWNwQbVQhQRNNTzbpg8Bg== 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=2a70b66f8983482e9d7577542436da58617b033e commit 2a70b66f8983482e9d7577542436da58617b033e Author: Warner Losh AuthorDate: 2022-07-08 17:53:31 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:54 +0000 sis_attach: Move waittime definition into for loop Sponsored by: Netflix (cherry picked from commit c9439e23cefb918ad71f568a35f2a468ef3365c8) --- sys/dev/sis/if_sis.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c index bb06b4a1f459..30d71ea60079 100644 --- a/sys/dev/sis/if_sis.c +++ b/sys/dev/sis/if_sis.c @@ -900,9 +900,8 @@ sis_attach(device_t dev) u_char eaddr[ETHER_ADDR_LEN]; struct sis_softc *sc; struct ifnet *ifp; - int error = 0, pmc, waittime = 0; + int error = 0, pmc; - waittime = 0; sc = device_get_softc(dev); sc->sis_dev = dev; @@ -1028,7 +1027,7 @@ sis_attach(device_t dev) * time we access it, we need to set SIS_EECMD_REQ. */ SIO_SET(SIS_EECMD_REQ); - for (waittime = 0; waittime < SIS_TIMEOUT; + for (int waittime = 0; waittime < SIS_TIMEOUT; waittime++) { /* Force EEPROM to idle state. */ sis_eeprom_idle(sc);