From: Jimmy Assarsson <extja@kvaser.com>
To: linux-can@vger.kernel.org
Cc: Jimmy Assarsson <jimmyassarsson@gmail.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Subject: [PATCH 3/9] can: kvaser_usb: Add intermediate variables
Date: Wed, 23 Jul 2025 10:35:02 +0200 [thread overview]
Message-ID: <20250723083508.40-4-extja@kvaser.com> (raw)
In-Reply-To: <20250723083508.40-1-extja@kvaser.com>
Add intermediate variables, for readability and to simplify future patches.
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
---
.../net/can/usb/kvaser_usb/kvaser_usb_core.c | 20 ++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
index 8003c3662247..264840d84987 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
@@ -364,10 +364,13 @@ static void kvaser_usb_read_bulk_callback(struct urb *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,
@@ -798,24 +801,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);
}
}
--
2.49.0
next prev parent reply other threads:[~2025-07-23 8:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-23 8:34 [PATCH 0/9] can: kvaser_usb: Simplify identification of physical CAN interfaces Jimmy Assarsson
2025-07-23 8:35 ` [PATCH 1/9] can: kvaser_usb: Add support to control CAN LEDs on device Jimmy Assarsson
2025-07-23 8:35 ` [PATCH 2/9] can: kvaser_usb: Add support for ethtool set_phys_id() Jimmy Assarsson
2025-07-23 8:35 ` Jimmy Assarsson [this message]
2025-07-23 8:35 ` [PATCH 4/9] can: kvaser_usb: Move comment regarding max_tx_urbs Jimmy Assarsson
2025-07-23 8:35 ` [PATCH 5/9] can: kvaser_usb: Store the different firmware version components in a struct Jimmy Assarsson
2025-07-23 8:35 ` [PATCH 6/9] can: kvaser_usb: Store additional device information Jimmy Assarsson
2025-07-23 8:35 ` [PATCH 7/9] can: kvaser_usb: Add devlink support Jimmy Assarsson
2025-07-23 8:35 ` [PATCH 8/9] can: kvaser_usb: Expose device information via devlink info_get() Jimmy Assarsson
2025-07-23 8:35 ` [PATCH 9/9] can: kvaser_usb: Add devlink port support Jimmy Assarsson
2025-07-23 12:44 ` [PATCH 0/9] can: kvaser_usb: Simplify identification of physical CAN interfaces Vincent Mailhol
2025-07-24 6:43 ` Jimmy Assarsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250723083508.40-4-extja@kvaser.com \
--to=extja@kvaser.com \
--cc=jimmyassarsson@gmail.com \
--cc=linux-can@vger.kernel.org \
--cc=mailhol.vincent@wanadoo.fr \
--cc=mkl@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox