Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2045ceae authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

net: remove unnecessary return's 



One of my pet coding style peeves is the practice of
adding extra return; at the end of function.
Kill several instances of this in network code.

I suppose some coccinelle wizardy could do this automatically.

Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45f74359

net/batman-adv/gateway_client.c

+0 −2
Original line number Diff line number Diff line
@@ -389,8 +389,6 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv, 
		batadv_neigh_ifinfo_free_ref(router_gw_tq);

	if (router_orig_tq)

		batadv_neigh_ifinfo_free_ref(router_orig_tq);



	return;

}



/**

net/ceph/osd_client.c

+0 −2
Original line number Diff line number Diff line
@@ -2082,7 +2082,6 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg) 
	pr_err("osdc handle_map corrupt msg\n");

	ceph_msg_dump(msg);

	up_write(&osdc->map_sem);

	return;

}



/*
@@ -2281,7 +2280,6 @@ static void handle_watch_notify(struct ceph_osd_client *osdc, 


bad:

	pr_err("osdc handle_watch_notify corrupt msg\n");

	return;

}



/*

net/core/request_sock.c

+0 −1
Original line number Diff line number Diff line
@@ -221,5 +221,4 @@ void reqsk_fastopen_remove(struct sock *sk, struct request_sock *req, 
out:

	spin_unlock_bh(&fastopenq->lock);

	sock_put(lsk);

	return;

}

net/ipv4/route.c

+0 −1
Original line number Diff line number Diff line
@@ -697,7 +697,6 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw, 


out_unlock:

	spin_unlock_bh(&fnhe_lock);

	return;

}



static void __ip_do_redirect(struct rtable *rt, struct sk_buff *skb, struct flowi4 *fl4,

net/ipv4/tcp_output.c

+0 −1
Original line number Diff line number Diff line
@@ -2071,7 +2071,6 @@ void tcp_send_loss_probe(struct sock *sk) 
	if (likely(!err))

		NET_INC_STATS_BH(sock_net(sk),

				 LINUX_MIB_TCPLOSSPROBES);

	return;

}



/* Push out any pending frames which were held back due to