]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
can: kvaser_usb: Add intermediate variables
authorJimmy Assarsson <extja@kvaser.com>
Fri, 25 Jul 2025 12:34:45 +0000 (14:34 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 25 Jul 2025 16:01:19 +0000 (18:01 +0200)
Add intermediate variables, for readability and to simplify future patches.

Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Link: https://patch.msgid.link/20250725123452.41-5-extja@kvaser.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c

index 7be8604bf7605c90cfa087941bcd6f5ad6fbe081..46e6cda0bf8d21c015813298ce4a456632cdacd4 100644 (file)
@@ -364,10 +364,13 @@ resubmit_urb:
        err = usb_submit_urb(urb, GFP_ATOMIC);
        if (err == -ENODEV) {
                for (i = 0; i < dev->nchannels; i++) {
-                       if (!dev->nets[i])
+                       struct kvaser_usb_net_priv *priv;
+
+                       priv = dev->nets[i];
+                       if (!priv)
                                continue;
 
-                       netif_device_detach(dev->nets[i]->netdev);
+                       netif_device_detach(priv->netdev);
                }
        } else if (err) {
                dev_err(&dev->intf->dev,
@@ -795,24 +798,27 @@ static void kvaser_usb_remove_interfaces(struct kvaser_usb *dev)
 {
        const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
        int i;
+       struct kvaser_usb_net_priv *priv;
 
        for (i = 0; i < dev->nchannels; i++) {
-               if (!dev->nets[i])
+               priv = dev->nets[i];
+               if (!priv)
                        continue;
 
-               unregister_candev(dev->nets[i]->netdev);
+               unregister_candev(priv->netdev);
        }
 
        kvaser_usb_unlink_all_urbs(dev);
 
        for (i = 0; i < dev->nchannels; i++) {
-               if (!dev->nets[i])
+               priv = dev->nets[i];
+               if (!priv)
                        continue;
 
                if (ops->dev_remove_channel)
-                       ops->dev_remove_channel(dev->nets[i]);
+                       ops->dev_remove_channel(priv);
 
-               free_candev(dev->nets[i]->netdev);
+               free_candev(priv->netdev);
        }
 }