Commit 48d80b48 authored by Jules Irenge's avatar Jules Irenge Committed by Leon Romanovsky
Browse files

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: default avatarJules Irenge <jbi.octave@gmail.com>
Link: https://lore.kernel.org/r/ZjF1Eedxwhn4JSkz@octinomon.home


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent e4e40a87

drivers/infiniband/core/device.c

+3 −7
Original line number Diff line number Diff line
@@ -2174,7 +2174,6 @@ int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev, 
	spin_unlock_irqrestore(&pdata->netdev_lock, flags);



	add_ndev_hash(pdata);

	if (old_ndev)

	__dev_put(old_ndev);



	return 0;
@@ -2235,7 +2234,6 @@ struct net_device *ib_device_get_netdev(struct ib_device *ib_dev, 
		spin_lock(&pdata->netdev_lock);

		res = rcu_dereference_protected(

			pdata->netdev, lockdep_is_held(&pdata->netdev_lock));

		if (res)

		dev_hold(res);

		spin_unlock(&pdata->netdev_lock);

	}
@@ -2311,8 +2309,6 @@ void ib_enum_roce_netdev(struct ib_device *ib_dev, 


			if (filter(ib_dev, port, idev, filter_cookie))

				cb(ib_dev, port, idev, cookie);



			if (idev)

			dev_put(idev);

		}

}

drivers/infiniband/core/lag.c

+1 −2
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ static struct net_device *rdma_get_xmit_slave_udp(struct ib_device *device, 
	slave = netdev_get_xmit_slave(master, skb,

				      !!(device->lag_flags &

					 RDMA_LAG_FLAGS_HASH_ALL_SLAVES));

	if (slave)

	dev_hold(slave);

	rcu_read_unlock();

	kfree_skb(skb);

drivers/infiniband/core/roce_gid_mgmt.c

+1 −2
Original line number Diff line number Diff line
@@ -601,7 +601,6 @@ static void del_netdev_default_ips_join(struct ib_device *ib_dev, u32 port, 


	rcu_read_lock();

	master_ndev = netdev_master_upper_dev_get_rcu(rdma_ndev);

	if (master_ndev)

	dev_hold(master_ndev);

	rcu_read_unlock();