Skip to content

Commit 7a1c2ab

Browse files
Yang Lirleon
authored andcommitted
RDMA/core: Remove NULL check before dev_{put, hold}
The call netdev_{put, hold} of dev_{put, hold} will check NULL, so there is no need to check before using dev_{put, hold}, remove it to silence the warning: ./drivers/infiniband/core/nldev.c:375:2-9: WARNING: NULL check before dev_{put, hold} functions is not needed. Reported-by: Abaci Robot <[email protected]> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=7047 Signed-off-by: Yang Li <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Leon Romanovsky <[email protected]>
1 parent b557063 commit 7a1c2ab

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

drivers/infiniband/core/lag.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ static struct net_device *rdma_get_xmit_slave_udp(struct ib_device *device,
102102

103103
void rdma_lag_put_ah_roce_slave(struct net_device *xmit_slave)
104104
{
105-
if (xmit_slave)
106-
dev_put(xmit_slave);
105+
dev_put(xmit_slave);
107106
}
108107

109108
struct net_device *rdma_lag_get_ah_roce_slave(struct ib_device *device,

drivers/infiniband/core/nldev.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,7 @@ static int fill_port_info(struct sk_buff *msg,
371371
}
372372

373373
out:
374-
if (netdev)
375-
dev_put(netdev);
374+
dev_put(netdev);
376375
return ret;
377376
}
378377

drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,10 +1021,8 @@ static int pvrdma_pci_probe(struct pci_dev *pdev,
10211021
pvrdma_free_irq(dev);
10221022
pci_free_irq_vectors(pdev);
10231023
err_free_cq_ring:
1024-
if (dev->netdev) {
1025-
dev_put(dev->netdev);
1026-
dev->netdev = NULL;
1027-
}
1024+
dev_put(dev->netdev);
1025+
dev->netdev = NULL;
10281026
pvrdma_page_dir_cleanup(dev, &dev->cq_pdir);
10291027
err_free_async_ring:
10301028
pvrdma_page_dir_cleanup(dev, &dev->async_pdir);
@@ -1064,10 +1062,8 @@ static void pvrdma_pci_remove(struct pci_dev *pdev)
10641062

10651063
flush_workqueue(event_wq);
10661064

1067-
if (dev->netdev) {
1068-
dev_put(dev->netdev);
1069-
dev->netdev = NULL;
1070-
}
1065+
dev_put(dev->netdev);
1066+
dev->netdev = NULL;
10711067

10721068
/* Unregister ib device */
10731069
ib_unregister_device(&dev->ib_dev);

drivers/infiniband/ulp/ipoib/ipoib_main.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2005,8 +2005,7 @@ static void ipoib_ndo_uninit(struct net_device *dev)
20052005
priv->wq = NULL;
20062006
}
20072007

2008-
if (priv->parent)
2009-
dev_put(priv->parent);
2008+
dev_put(priv->parent);
20102009
}
20112010

20122011
static int ipoib_set_vf_link_state(struct net_device *dev, int vf, int link_state)

0 commit comments

Comments
 (0)