Commit 1160dfa1 authored by Yajun Deng's avatar Yajun Deng Committed by David S. Miller
Browse files

net: Remove redundant if statements 



The 'if (dev)' statement already move into dev_{put , hold}, so remove
redundant if statements.

Signed-off-by: default avatarYajun Deng <yajun.deng@linux.dev>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a85b99ab

net/batman-adv/bridge_loop_avoidance.c

+2 −4
Original line number Diff line number Diff line
@@ -2274,7 +2274,6 @@ int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb) 
	if (primary_if)

		batadv_hardif_put(primary_if);



	if (soft_iface)

	dev_put(soft_iface);



	return ret;
@@ -2446,7 +2445,6 @@ int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb) 
	if (primary_if)

		batadv_hardif_put(primary_if);



	if (soft_iface)

	dev_put(soft_iface);



	return ret;

net/batman-adv/distributed-arp-table.c

+1 −2
Original line number Diff line number Diff line
@@ -984,7 +984,6 @@ int batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb) 
	if (primary_if)

		batadv_hardif_put(primary_if);



	if (soft_iface)

	dev_put(soft_iface);



	return ret;

net/batman-adv/gateway_client.c

+1 −2
Original line number Diff line number Diff line
@@ -557,7 +557,6 @@ int batadv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb) 
out:

	if (primary_if)

		batadv_hardif_put(primary_if);

	if (soft_iface)

	dev_put(soft_iface);



	return ret;

net/batman-adv/multicast.c

+3 −6
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ static struct net_device *batadv_mcast_get_bridge(struct net_device *soft_iface) 
		upper = netdev_master_upper_dev_get_rcu(upper);

	} while (upper && !(upper->priv_flags & IFF_EBRIDGE));



	if (upper)

	dev_hold(upper);

	rcu_read_unlock();
@@ -509,7 +508,6 @@ batadv_mcast_mla_softif_get(struct net_device *dev, 
	}



out:

	if (bridge)

	dev_put(bridge);



	return ret4 + ret6;
@@ -2239,7 +2237,6 @@ batadv_mcast_netlink_get_primary(struct netlink_callback *cb, 
	}



out:

	if (soft_iface)

	dev_put(soft_iface);



	if (!ret && primary_if)

net/batman-adv/originator.c

+4 −8
Original line number Diff line number Diff line
@@ -799,11 +799,9 @@ int batadv_hardif_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb) 
 out:

	if (hardif)

		batadv_hardif_put(hardif);

	if (hard_iface)

	dev_put(hard_iface);

	if (primary_if)

		batadv_hardif_put(primary_if);

	if (soft_iface)

	dev_put(soft_iface);



	return ret;
@@ -1412,11 +1410,9 @@ int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb) 
 out:

	if (hardif)

		batadv_hardif_put(hardif);

	if (hard_iface)

	dev_put(hard_iface);

	if (primary_if)

		batadv_hardif_put(primary_if);

	if (soft_iface)

	dev_put(soft_iface);



	return ret;