| Message ID | 20241122221650.633981-4-dario.binacchi@amarulasolutions.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Fix {rx,tx}_errors CAN statistics | expand |
On 22.11.2024 23:15:44, Dario Binacchi wrote: > Throughout the sun4i_can_err() function, the likely() macro is used to > check the skb buffer, except in one instance. This patch makes the code > consistent by using the macro in that case as well. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> I'll apply this one on can-next. Marc
diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c index 17f94cca93fb..840b972498c1 100644 --- a/drivers/net/can/sun4i_can.c +++ b/drivers/net/can/sun4i_can.c @@ -570,7 +570,7 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status) else state = CAN_STATE_ERROR_ACTIVE; } - if (skb && state != CAN_STATE_BUS_OFF) { + if (likely(skb) && state != CAN_STATE_BUS_OFF) { cf->can_id |= CAN_ERR_CNT; cf->data[6] = txerr; cf->data[7] = rxerr;
Throughout the sun4i_can_err() function, the likely() macro is used to check the skb buffer, except in one instance. This patch makes the code consistent by using the macro in that case as well. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- Changes in v2: - Added in v2 drivers/net/can/sun4i_can.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)