[PATCH v2 4/4] can: sja1000: Consolidate and unify state change handling.

[PATCH v2 4/4] can: sja1000: Consolidate and unify state change handling.

[Andri Yngvason]

Replacing error state change handling with the new mechanism.

Signed-off-by: Andri Yngvason <andri.yngvason@marel.com>
---
 drivers/net/can/sja1000/sja1000.c | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index b27ac60..953bf2d 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -392,6 +392,8 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc,
uint8_t status)
     struct can_frame *cf;
     struct sk_buff *skb;
     enum can_state state = priv->can.state;
+    enum can_state rx_state, tx_state;
+    unsigned int rxerr, txerr;
     uint8_t ecc, alc;
 
     skb = alloc_can_err_skb(dev, &cf);
@@ -467,27 +469,18 @@ static int sja1000_err(struct net_device *dev, uint8_t
isrc, uint8_t status)
         cf->data[0] = alc & 0x1f;
     }
 
-    if (state != priv->can.state && (state == CAN_STATE_ERROR_WARNING ||
-                     state == CAN_STATE_ERROR_PASSIVE)) {
-        uint8_t rxerr = priv->read_reg(priv, SJA1000_RXERR);
-        uint8_t txerr = priv->read_reg(priv, SJA1000_TXERR);
-        cf->can_id |= CAN_ERR_CRTL;
-        if (state == CAN_STATE_ERROR_WARNING) {
-            priv->can.can_stats.error_warning++;
-            cf->data[1] = (txerr > rxerr) ?
-                CAN_ERR_CRTL_TX_WARNING :
-                CAN_ERR_CRTL_RX_WARNING;
-        } else {
-            priv->can.can_stats.error_passive++;
-            cf->data[1] = (txerr > rxerr) ?
-                CAN_ERR_CRTL_TX_PASSIVE :
-                CAN_ERR_CRTL_RX_PASSIVE;
-        }
-        cf->data[6] = txerr;
-        cf->data[7] = rxerr;
-    }
+    if (state != priv->can.state) {
+        txerr = priv->read_reg(priv, SJA1000_TXERR);
+        rxerr = priv->read_reg(priv, SJA1000_RXERR);
 
-    priv->can.state = state;
+        tx_state = can_errcnt_to_state(txerr);
+        rx_state = can_errcnt_to_state(rxerr);
+
+        can_change_state(dev, cf, state, tx_state, rx_state);
+
+        cf->data[6] = rxerr;
+        cf->data[7] = txerr;
+    }
 
     netif_rx(skb);
 
-- 
1.9.1