Skip to content

Commit 48d80b4

Browse files
irengerleon
authored andcommitted
RDMA/core: Remove NULL check before dev_{put, hold}
Coccinelle reports a warning WARNING: NULL check before dev_{put, hold} functions is not needed The reason is the call netdev_{put, hold} of dev_{put,hold} will check NULL There is no need to check before using dev_{put, hold} Signed-off-by: Jules Irenge <jbi.octave@gmail.com> Link: https://lore.kernel.org/r/ZjF1Eedxwhn4JSkz@octinomon.home Signed-off-by: Leon Romanovsky <leon@kernel.org>
1 parent e4e40a8 commit 48d80b4

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

drivers/infiniband/core/device.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2174,8 +2174,7 @@ int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev,
21742174
spin_unlock_irqrestore(&pdata->netdev_lock, flags);
21752175

21762176
add_ndev_hash(pdata);
2177-
if (old_ndev)
2178-
__dev_put(old_ndev);
2177+
__dev_put(old_ndev);
21792178

21802179
return 0;
21812180
}
@@ -2235,8 +2234,7 @@ struct net_device *ib_device_get_netdev(struct ib_device *ib_dev,
22352234
spin_lock(&pdata->netdev_lock);
22362235
res = rcu_dereference_protected(
22372236
pdata->netdev, lockdep_is_held(&pdata->netdev_lock));
2238-
if (res)
2239-
dev_hold(res);
2237+
dev_hold(res);
22402238
spin_unlock(&pdata->netdev_lock);
22412239
}
22422240

@@ -2311,9 +2309,7 @@ void ib_enum_roce_netdev(struct ib_device *ib_dev,
23112309

23122310
if (filter(ib_dev, port, idev, filter_cookie))
23132311
cb(ib_dev, port, idev, cookie);
2314-
2315-
if (idev)
2316-
dev_put(idev);
2312+
dev_put(idev);
23172313
}
23182314
}
23192315

drivers/infiniband/core/lag.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ static struct net_device *rdma_get_xmit_slave_udp(struct ib_device *device,
9393
slave = netdev_get_xmit_slave(master, skb,
9494
!!(device->lag_flags &
9595
RDMA_LAG_FLAGS_HASH_ALL_SLAVES));
96-
if (slave)
97-
dev_hold(slave);
96+
dev_hold(slave);
9897
rcu_read_unlock();
9998
kfree_skb(skb);
10099
return slave;

drivers/infiniband/core/roce_gid_mgmt.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,8 +601,7 @@ static void del_netdev_default_ips_join(struct ib_device *ib_dev, u32 port,
601601

602602
rcu_read_lock();
603603
master_ndev = netdev_master_upper_dev_get_rcu(rdma_ndev);
604-
if (master_ndev)
605-
dev_hold(master_ndev);
604+
dev_hold(master_ndev);
606605
rcu_read_unlock();
607606

608607
if (master_ndev) {

0 commit comments

Comments
 (0)