From nobody Fri Dec 03 11:28:54 2021 X-Original-To: dev-commits-src-branches@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 3A22318348F5; Fri, 3 Dec 2021 11:28:56 +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 4J59ZH1Xkdz3Dh7; Fri, 3 Dec 2021 11:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E3A1E7F3B; Fri, 3 Dec 2021 11:28: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 1B3BSsR5002486; Fri, 3 Dec 2021 11:28:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B3BSsGX002485; Fri, 3 Dec 2021 11:28:54 GMT (envelope-from git) Date: Fri, 3 Dec 2021 11:28:54 GMT Message-Id: <202112031128.1B3BSsGX002485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: b26743df026b - stable/12 - twsi: remove write-only softc field List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b26743df026b3c4ce47b6ee17271b84f52147c12 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638530935; 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=ezTKMr7V9G/uoOuQscA3LABS9Nig1bwlVhgXsj/Q91c=; b=PebrnsWt/c1G/kYtqTyaDet6Z1hu8AqnC8Ofa+gbVYOKHX99COBzji39kz1z3skhTdSYVI KA5fNbQ1BS0+UBYB5SVrsMoZjW+i+AyjyOotgD21mIxZYblW6TUd3KFbywbHvrdaBb1jIG pn29QP5P1YdiMRL7MHDUYy0IpustNwFexk7kxntokgSbI3iyiG/kMcHwgQdHNac5vxqHiE 1FMdsdLO8YT2thtvQZkAGyYJVHU7jlziEBZGa3RY2eZhyXNFhWzixGBcamWPlhXV49pikt GbPPVKz1A/8xwJM2029i5GzICNmRIcmhYapgNqHauOw+5oF0i4yZJvnTTdj8tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638530935; a=rsa-sha256; cv=none; b=bXekRaObSGwqhetkTbE8KIxzADDksL9pZSPeYtPSL9+B27i4Trvh9LtWvdZqhDACZk99Uo hJ6M8jRT7k73ewUc0ptJAVCtEfMYfK1pebtovoUJhrtV+TV0JMvlRvCVaHNEcyGiD5Cspv Niw0T/ByPdYkD+bMdB0zXOdTAoqYivAz0cn/TEom6ZZxQd1VayqyNc7dZ2Z8Jo4rmmO/qN SgfaebMcf4FyVgO6Mx1NS/uxv/AE6Eso4ut52WtVEpw5/RwI09/Luqxqwvn3vBEKJwBnqs 9Y5T66a4n8FgcoTeDRTSNRFWR2/fL3VHQlnA0Vd5ZF2kYOtPVsjssVakHzE++Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=b26743df026b3c4ce47b6ee17271b84f52147c12 commit b26743df026b3c4ce47b6ee17271b84f52147c12 Author: Andriy Gapon AuthorDate: 2021-11-26 06:45:12 +0000 Commit: Andriy Gapon CommitDate: 2021-12-03 09:35:39 +0000 twsi: remove write-only softc field (cherry picked from commit f00bc54f62c455c7ed44afee736c3c64873a305a) --- sys/dev/iicbus/twsi/a10_twsi.c | 2 -- sys/dev/iicbus/twsi/twsi.h | 1 - 2 files changed, 3 deletions(-) diff --git a/sys/dev/iicbus/twsi/a10_twsi.c b/sys/dev/iicbus/twsi/a10_twsi.c index 17f551f27234..7554db0fbc94 100644 --- a/sys/dev/iicbus/twsi/a10_twsi.c +++ b/sys/dev/iicbus/twsi/a10_twsi.c @@ -121,8 +121,6 @@ a10_twsi_attach(device_t dev) sc->reg_baud_rate = TWI_CCR; sc->reg_soft_reset = TWI_SRST; - sc->need_ack = true; - if (ofw_bus_is_compatible(dev, "allwinner,sun6i-a31-i2c") || ofw_bus_is_compatible(dev, "allwinner,sun6i-a83t-i2c")) sc->iflag_w1c = true; diff --git a/sys/dev/iicbus/twsi/twsi.h b/sys/dev/iicbus/twsi/twsi.h index fd107883c07c..fdbd193dbe5b 100644 --- a/sys/dev/iicbus/twsi/twsi.h +++ b/sys/dev/iicbus/twsi/twsi.h @@ -65,7 +65,6 @@ struct twsi_softc { int transfer; int error; uint32_t control_val; - bool need_ack; bool iflag_w1c; bus_size_t reg_data;