From nobody Wed Dec 22 06:51:24 2021 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 986B118F737B; Wed, 22 Dec 2021 06:51:24 +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 4JJkWJ2W3gz3LJY; Wed, 22 Dec 2021 06:51:24 +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 3600A18C34; Wed, 22 Dec 2021 06:51:24 +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 1BM6pOL8035161; Wed, 22 Dec 2021 06:51:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BM6pOsi035160; Wed, 22 Dec 2021 06:51:24 GMT (envelope-from git) Date: Wed, 22 Dec 2021 06:51:24 GMT Message-Id: <202112220651.1BM6pOsi035160@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: c7003fe467ef - stable/13 - rk_i2c: remove write-only softc field 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c7003fe467ef2016bc563fd0daba01c2c8fe94a2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640155884; 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=oRjI2a9KJeIZiE8Z0jhnrjoEHoFJC0OLNV1WLPA63JY=; b=sAB6jqL0bXsh8ABvLn+hBNzuEBGUTiybycOMYXyGVPeOfhSxx1SXcEm0eobiIdXiabysOr 1L8mqmlNMsBdyI0I2RMo5/dgIIBErzVqJzUbyDfssA6OAbbtGOUIrkYDcACJINdUrba0E/ ug+uFuM/6Wh5ptjmeBptUuwdwATl/sxJ0pvAR5sNOOCDgYHsC+A9djkBnbIcLGyTRBSAjb dfomrSr2CG3O6y6btS9T3LTx8OxvoAw9x+9ixojOcrLpGxrmu5a4ey4bE9EXifAG+MUOcr /ohrL2nVBPZTtZC4tnW0k8RR8k8/cUku7XFLl6MHnLtL2jGSxoTFFPE78279Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640155884; a=rsa-sha256; cv=none; b=r/7kgi+LOjtq4HZ2xpqwR84yArRsYxW47uYmzeU5WqjIvdGBmZjrqeJV39Uljij2tAPQNV ehrL1+vsPxolcN2X2V6QrLwDwkVQu1fvH2D6z/1FfWDqti23lFBsLx7u6FLOLkhTWz5Etf lSPhDKagW5YO5MTfLICPt/V4sbL4XkutxVBXRui/gn0TtH5ypytcDxgG8zZ3mYKgnSBx/9 1BtkujxA7GrwzgmdVVkgiGSz8YvsgT56eQ5Zbz6XQldrUT4YMbv0ocIVJ3ohQR3tz1NGca sCvMSvpW4oDf83Ytq62YW9zPU3HkOwy4xJholgeV1vs7LndpRBj6iF6W8DLlFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=c7003fe467ef2016bc563fd0daba01c2c8fe94a2 commit c7003fe467ef2016bc563fd0daba01c2c8fe94a2 Author: Andriy Gapon AuthorDate: 2021-12-15 08:37:04 +0000 Commit: Andriy Gapon CommitDate: 2021-12-22 06:49:15 +0000 rk_i2c: remove write-only softc field (cherry picked from commit 5f863d7e1319afe32d18e505c26acaacfcae0db7) --- sys/arm64/rockchip/rk_i2c.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/arm64/rockchip/rk_i2c.c index fa824c76003b..8d2a3e0ead01 100644 --- a/sys/arm64/rockchip/rk_i2c.c +++ b/sys/arm64/rockchip/rk_i2c.c @@ -130,7 +130,6 @@ struct rk_i2c_softc { uint32_t ipd; struct iic_msg *msg; size_t cnt; - int msg_len; bool transfer_done; bool nak_recv; bool tx_slave_addr; @@ -394,13 +393,11 @@ rk_i2c_start_xfer(struct rk_i2c_softc *sc, struct iic_msg *msg, boolean_t last) sc->cnt = 0; sc->state = STATE_IDLE; sc->msg = msg; - sc->msg_len = sc->msg->len; reg = RK_I2C_READ(sc, RK_I2C_CON) & ~RK_I2C_CON_CTRL_MASK; if (!(sc->msg->flags & IIC_M_NOSTART)) { /* Stadard message */ if (sc->mode == RK_I2C_CON_MODE_TX) { - sc->msg_len++; /* Take slave address in account. */ sc->tx_slave_addr = true; } sc->state = STATE_START;