This is a preparation patch to make use of can_state_get_by_berr_counter() which works on a struct can_berr_counter. Reuse the existing function sja1000_get_berr_counter() to read the error counters into a struct can_berr_counter. Reviewed-by: Michael Tretter Link: https://patch.msgid.link/20260123-sja1000-state-handling-v2-1-687498087dad@pengutronix.de Signed-off-by: Marc Kleine-Budde --- drivers/net/can/sja1000/sja1000.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index a8fa0d6516b9..ae3244b63b65 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c @@ -411,14 +411,13 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) struct sk_buff *skb; enum can_state state = priv->can.state; enum can_state rx_state, tx_state; - unsigned int rxerr, txerr; + struct can_berr_counter bec; uint8_t ecc, alc; int ret = 0; skb = alloc_can_err_skb(dev, &cf); - txerr = priv->read_reg(priv, SJA1000_TXERR); - rxerr = priv->read_reg(priv, SJA1000_RXERR); + sja1000_get_berr_counter(dev, &bec); if (isrc & IRQ_DOI) { /* data overrun interrupt */ @@ -455,8 +454,8 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) } if (state != CAN_STATE_BUS_OFF && skb) { cf->can_id |= CAN_ERR_CNT; - cf->data[6] = txerr; - cf->data[7] = rxerr; + cf->data[6] = bec.txerr; + cf->data[7] = bec.rxerr; } if (isrc & IRQ_BEI) { /* bus error interrupt */ @@ -515,8 +514,8 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) } if (state != priv->can.state) { - tx_state = txerr >= rxerr ? state : 0; - rx_state = txerr <= rxerr ? state : 0; + tx_state = bec.txerr >= bec.rxerr ? state : 0; + rx_state = bec.txerr <= bec.rxerr ? state : 0; can_change_state(dev, cf, tx_state, rx_state); -- 2.51.0