]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
can: rcar_canfd: Add helper variable ndev to rcar_canfd_rx_pkt()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 11 Jun 2025 15:37:32 +0000 (17:37 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 13 Jun 2025 07:34:08 +0000 (09:34 +0200)
rcar_canfd_rx_pkt() has many users of "priv->ndev".  Introduce a
shorthand to simplify the code.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://patch.msgid.link/22afe32a65f7c3e64ce3917aec943ac24d6e185a.1749655315.git.geert+renesas@glider.be
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/rcar/rcar_canfd.c

index b353168f75f28565995300de14e77e0db0fe83e5..ddf3b91d3d2bba97c031f1f86f741d780392fe04 100644 (file)
@@ -1684,7 +1684,8 @@ static netdev_tx_t rcar_canfd_start_xmit(struct sk_buff *skb,
 
 static void rcar_canfd_rx_pkt(struct rcar_canfd_channel *priv)
 {
-       struct net_device_stats *stats = &priv->ndev->stats;
+       struct net_device *ndev = priv->ndev;
+       struct net_device_stats *stats = &ndev->stats;
        struct rcar_canfd_global *gpriv = priv->gpriv;
        struct canfd_frame *cf;
        struct sk_buff *skb;
@@ -1700,14 +1701,13 @@ static void rcar_canfd_rx_pkt(struct rcar_canfd_channel *priv)
 
                if ((priv->can.ctrlmode & CAN_CTRLMODE_FD) &&
                    sts & RCANFD_RFFDSTS_RFFDF)
-                       skb = alloc_canfd_skb(priv->ndev, &cf);
+                       skb = alloc_canfd_skb(ndev, &cf);
                else
-                       skb = alloc_can_skb(priv->ndev,
-                                           (struct can_frame **)&cf);
+                       skb = alloc_can_skb(ndev, (struct can_frame **)&cf);
        } else {
                id = rcar_canfd_read(priv->base, RCANFD_C_RFID(ridx));
                dlc = rcar_canfd_read(priv->base, RCANFD_C_RFPTR(ridx));
-               skb = alloc_can_skb(priv->ndev, (struct can_frame **)&cf);
+               skb = alloc_can_skb(ndev, (struct can_frame **)&cf);
        }
 
        if (!skb) {
@@ -1728,7 +1728,7 @@ static void rcar_canfd_rx_pkt(struct rcar_canfd_channel *priv)
 
                if (sts & RCANFD_RFFDSTS_RFESI) {
                        cf->flags |= CANFD_ESI;
-                       netdev_dbg(priv->ndev, "ESI Error\n");
+                       netdev_dbg(ndev, "ESI Error\n");
                }
 
                if (!(sts & RCANFD_RFFDSTS_RFFDF) && (id & RCANFD_RFID_RFRTR)) {