projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6841cab
)
can: dev: can_restart(): reverse logic to remove need for goto
author
Marc Kleine-Budde
<mkl@pengutronix.de>
Fri, 29 Sep 2023 07:47:38 +0000
(09:47 +0200)
committer
Marc Kleine-Budde
<mkl@pengutronix.de>
Thu, 5 Oct 2023 19:32:45 +0000
(21:32 +0200)
Reverse the logic in the if statement and eliminate the need for a
goto to simplify code readability.
Link:
https://lore.kernel.org/all/20231005-can-dev-fix-can-restart-v2-3-91b5c1fd922c@pengutronix.de
Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/dev/dev.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/dev/dev.c
b/drivers/net/can/dev/dev.c
index 735d5de3caa0e37d6b8be887efb1fb3830ca3e87..9014256c486a5d80c0755b71c39e8702848243c0 100644
(file)
--- a/
drivers/net/can/dev/dev.c
+++ b/
drivers/net/can/dev/dev.c
@@
-142,14
+142,11
@@
static void can_restart(struct net_device *dev)
/* send restart message upstream */
skb = alloc_can_err_skb(dev, &cf);
- if (!skb)
- goto restart;
-
- cf->can_id |= CAN_ERR_RESTARTED;
-
- netif_rx(skb);
+ if (skb) {
+ cf->can_id |= CAN_ERR_RESTARTED;
+ netif_rx(skb);
+ }
-restart:
netdev_dbg(dev, "restarted\n");
priv->can_stats.restarts++;