From nobody Wed Dec 22 06:59:14 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 0432A18FA42C; Wed, 22 Dec 2021 06:59:15 +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 4JJkhL579Lz3PMW; Wed, 22 Dec 2021 06:59:14 +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 898241884E; Wed, 22 Dec 2021 06:59:14 +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 1BM6xE91036784; Wed, 22 Dec 2021 06:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BM6xEEi036783; Wed, 22 Dec 2021 06:59:14 GMT (envelope-from git) Date: Wed, 22 Dec 2021 06:59:14 GMT Message-Id: <202112220659.1BM6xEEi036783@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: 20252a39d4b1 - stable/12 - rk_i2c: 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: 20252a39d4b1e7e4aaef40e047896fd572aafdc6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640156354; 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=UaWbNClypht1AA0D6kzeT6pv8lIzaxYx1KxryuMHqI8=; b=yHXcRs+4D1x/dep01XJjLsPxnSFgdN/xhi02iZLdveU5n+FRPUq7DpC8NUA9+4llEzLyiI Tq+iUbDGyHTTBEq7iGMCAXKPIiDYoFQm93frFP3c2m+4mKVhaFcP/Kn3G119q7jNseB/If cCF+KKgXPLaurisLyLqHmK0/6bH5r/bRXr6YQTgfnB2T0dbgEhx+HAaOI2uZLgt3CvOaUF 2Lo+3RZWVA8bw+at/IqBbhmy3sgg14Il2rn4RkiZTMSwvH6zjUYvWZRqZvz2ve5g5qtdSp 9FUcroM6gSptLMA5yBK/SKykaj6uvRT6JIP1bckR6fnHntv5yW5GVFz4aAv1SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640156354; a=rsa-sha256; cv=none; b=nLPe3DLuNTusJ/tiffDSMzaa/LDTWHOy+IFQrY/86CFI1CaZAREhRgdqXws3EXkZ2ihI3D T9xrH5gvZ9zpGLgo7LjGxruFXDEnIJBE81ukWY1zXflf340wUEZhCZg7/ytBm6WHSYyin5 w4puS21hY7e8J4gxon+nTefzGoAfB/orLFrjmHjjclRyGjx6st+DLB0lDLTm5S8MK8LhKA c3xE6Ai0nsX5sa3Jid5mUXR90XZO4jFaDZvMMYu1kttq2o0mbyZoGdLtuP6f28TxRfmdXC 2YCSfQI6RylL9Y61WOEzuMx1EhKnjxjAHM9vwtRQQLWA8bgjXDroj12d0qzpWA== 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=20252a39d4b1e7e4aaef40e047896fd572aafdc6 commit 20252a39d4b1e7e4aaef40e047896fd572aafdc6 Author: Andriy Gapon AuthorDate: 2021-12-15 08:37:04 +0000 Commit: Andriy Gapon CommitDate: 2021-12-22 06:56:55 +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 c59564688756..1a70f58ba02f 100644 --- a/sys/arm64/rockchip/rk_i2c.c +++ b/sys/arm64/rockchip/rk_i2c.c @@ -131,7 +131,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; @@ -396,13 +395,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;