The branch main has been updated by avg:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=5f863d7e1319afe32d18e505c26acaacfcae0db7

commit 5f863d7e1319afe32d18e505c26acaacfcae0db7
Author:     Andriy Gapon <a...@freebsd.org>
AuthorDate: 2021-12-15 08:37:04 +0000
Commit:     Andriy Gapon <a...@freebsd.org>
CommitDate: 2021-12-15 11:14:29 +0000

    rk_i2c: remove write-only softc field
    
    MFC after:      1 week
---
 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 c54f523088fe..11aaf51f7e62 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;
@@ -417,13 +416,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;

Reply via email to