git: 20252a39d4b1 - stable/12 - rk_i2c: remove write-only softc field
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 Dec 2021 06:59:14 UTC
The branch stable/12 has been updated by avg:
URL: https://cgit.FreeBSD.org/src/commit/?id=20252a39d4b1e7e4aaef40e047896fd572aafdc6
commit 20252a39d4b1e7e4aaef40e047896fd572aafdc6
Author: Andriy Gapon <avg@FreeBSD.org>
AuthorDate: 2021-12-15 08:37:04 +0000
Commit: Andriy Gapon <avg@FreeBSD.org>
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;