Skip to content

Commit 827158a

Browse files
Jimmy Assarssonmarckleinebudde
authored andcommitted
can: kvaser_usb: Add intermediate variables
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>
1 parent c151b06 commit 827158a

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -364,10 +364,13 @@ static void kvaser_usb_read_bulk_callback(struct urb *urb)
364364
err = usb_submit_urb(urb, GFP_ATOMIC);
365365
if (err == -ENODEV) {
366366
for (i = 0; i < dev->nchannels; i++) {
367-
if (!dev->nets[i])
367+
struct kvaser_usb_net_priv *priv;
368+
369+
priv = dev->nets[i];
370+
if (!priv)
368371
continue;
369372

370-
netif_device_detach(dev->nets[i]->netdev);
373+
netif_device_detach(priv->netdev);
371374
}
372375
} else if (err) {
373376
dev_err(&dev->intf->dev,
@@ -795,24 +798,27 @@ static void kvaser_usb_remove_interfaces(struct kvaser_usb *dev)
795798
{
796799
const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
797800
int i;
801+
struct kvaser_usb_net_priv *priv;
798802

799803
for (i = 0; i < dev->nchannels; i++) {
800-
if (!dev->nets[i])
804+
priv = dev->nets[i];
805+
if (!priv)
801806
continue;
802807

803-
unregister_candev(dev->nets[i]->netdev);
808+
unregister_candev(priv->netdev);
804809
}
805810

806811
kvaser_usb_unlink_all_urbs(dev);
807812

808813
for (i = 0; i < dev->nchannels; i++) {
809-
if (!dev->nets[i])
814+
priv = dev->nets[i];
815+
if (!priv)
810816
continue;
811817

812818
if (ops->dev_remove_channel)
813-
ops->dev_remove_channel(dev->nets[i]);
819+
ops->dev_remove_channel(priv);
814820

815-
free_candev(dev->nets[i]->netdev);
821+
free_candev(priv->netdev);
816822
}
817823
}
818824

0 commit comments

Comments
 (0)