drivers/net/wireless/libertas: move a dereference below a NULL test
Subsystems (3)
PATCH 3/4 drivers/net/wireless/libertas: move a dereference below a NULL test
From: Julia Lawall <[email protected]>
In each case, if the NULL test is necessary, then the dereference should be moved below the NULL test. I have also taken advantage of the availability of the value of priv->dev in the subsequent calls to netif_stop_queue and netif_carrier_off.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
type T;
expression E;
identifier i,fld;
statement S;
@@
- T i = E->fld;
+ T i;
... when != E
when != i
if (E == NULL) S
+ i = E->fld;
// </smpl>
Signed-off-by Julia Lawall <[email protected]>
Acked-by Dan Williams <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/net/wireless/libertas/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/libertas/main.c renamed from drivers/net/wireless/libertas/main.c~drivers-net-wireless-libertas-move-a-dereference-below-a-null-test +4 -3
@@ -1369,7 +1369,7 @@ EXPORT_SYMBOL_GPL(lbs_start_card);void lbs_stop_card (struct lbs_private *priv) { -struct net_device *dev = priv->dev; +struct net_device *dev;struct cmd_ctrl_node *cmdnode;unsigned long flags;
@@ -1377,9 +1377,10 @@ void lbs_stop_card(struct lbs_private *pif (!priv) goto out; + dev = priv->dev; -netif_stop_queue (priv->dev); -netif_carrier_off (priv->dev); +netif_stop_queue (dev); +netif_carrier_off (dev);lbs_debugfs_remove_one (priv);if (priv->mesh_tlv) {
_
Applied.