From nobody Tue Apr 05 04:32:32 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 C36D11A9151A; Tue, 5 Apr 2022 04:32:33 +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 4KXZW46cqjz4gQN; Tue, 5 Apr 2022 04:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649133153; 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=XCH0BT5vzNPjgcwmLNZti77/aj1mYYw6EORzcgJYNQw=; b=qYjDsCgKPckWj7mlxJjhmqtPIniJZp7coIfUdQmfiRUsZaTjmPOC3mVRbkDH3UDD11WB5Z YWc9nVsm/bJ8Y0RIe+h5MSRNXIFPRFkYNBla6eC8jWhSyjNZL3KNgQ3Gz0uTkUjocNT8Lz BzwHNnIhF/Gwa2zqDtMCcGIbpPj8Tdemr2ocKW40RtQUm+r7E0KJMHJ3nZ4UZdR4TwYs3O YFl1q6eBMBweFfo3EAo8dNWrkV+8HiPNCfWLLXHnjrT/1ZtHXwuqalp7pKxF39w1Eh9Muf kLDekOkxPREp2ZO2+QKb9Nu1rEXMa2HhPqUbGMKC51xQUWlESoz6kK65rRB5Fg== 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 974A61FC1A; Tue, 5 Apr 2022 04:32:32 +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 2354WW9T009135; Tue, 5 Apr 2022 04:32:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2354WWUM009134; Tue, 5 Apr 2022 04:32:32 GMT (envelope-from git) Date: Tue, 5 Apr 2022 04:32:32 GMT Message-Id: <202204050432.2354WWUM009134@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: c9439e23cefb - main - 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/main X-Git-Reftype: branch X-Git-Commit: c9439e23cefb918ad71f568a35f2a468ef3365c8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649133153; 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=XCH0BT5vzNPjgcwmLNZti77/aj1mYYw6EORzcgJYNQw=; b=hNbRFyketL0InId789CBsyqDlGfeFfKK92zEwl+76PxA/jqW+vYadFW0eQaVKg20D8gZAA myRuYNbW3QNi1zvF79qwoQD0XPj2+zdrsuKgJKMMcE7NqQ/f6HoxmgP6HwEhhbAL7SZoWJ NYPnSLDLa+HJg4AvOyBvCunw+ummwH+ViCce5zqlk89Sv97ZqrQLsflGYp6x+cTim+P7OF WuS1BHDpmo+3A3mONXjKGI2OAao/hKZxXYBHR5NLyATJbI2hZBK5CiyZvuuEF8Ista7vxd PIydC9lBvmBEYUU371cjhkClUgAXrUhgHAC6spbtsTTsK0CffKG3sAKhZrhdPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649133153; a=rsa-sha256; cv=none; b=aWgYKmPmq8VBcQbJAoJ5VSg00pqlw3IWTyFKpqjUwwqEJXQQtA/4owW8aYGD+gidp6qFqv +VINmJFUAjOIbnrRpw2IxDUC+cpS5Ol9y3HAWoCe4oGmCGWzCTA3P/41Wf/0uG8mM5h6KA 75DdZ+Jy0wZYHB5Y9Xv2i/oQxQuSQzY10Nan9Yy2m9WBTekgn/xr3rUEDYBsqz/y8evI8n 1+blYL8ta7TlaakomwYX19+QEMFMsR2OkCtB8xUboOKK6SpCWDOf9EKSg1w7XKS0l82Ms0 FeU0itZJdXs+git46tEN8ncx6QJJ89M1fG2zIQ1zZ/LHeMYAAc5oGs+zrk47Dg== 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=c9439e23cefb918ad71f568a35f2a468ef3365c8 commit c9439e23cefb918ad71f568a35f2a468ef3365c8 Author: Warner Losh AuthorDate: 2022-04-05 02:13:32 +0000 Commit: Warner Losh CommitDate: 2022-04-05 04:29:57 +0000 sis_attach: Move waittime definition into for loop Sponsored by: Netflix --- 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 ecc42e991df4..7780610a89a6 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);