| Message ID | 20171025135755.25487-1-jslaby@suse.cz |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [1/1] l2tp: cleanup l2tp_tunnel_delete calls | expand |
On Wed, Oct 25, 2017 at 03:57:55PM +0200, Jiri Slaby wrote: > l2tp_tunnel_delete does not return anything since commit 62b982eeb458 > ("l2tp: fix race condition in l2tp_tunnel_delete"). But call sites of > l2tp_tunnel_delete still do casts to void to avoid unused return value > warnings. > > Kill these now useless casts. > Acked-by: Guillaume Nault <g.nault@alphalink.fr>
From: Jiri Slaby <jslaby@suse.cz> Date: Wed, 25 Oct 2017 15:57:55 +0200 > l2tp_tunnel_delete does not return anything since commit 62b982eeb458 > ("l2tp: fix race condition in l2tp_tunnel_delete"). But call sites of > l2tp_tunnel_delete still do casts to void to avoid unused return value > warnings. > > Kill these now useless casts. > > Signed-off-by: Jiri Slaby <jslaby@suse.cz> Appied to net-next, thanks.
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 02d61101b108..af22aa8ae35b 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -1891,7 +1891,7 @@ static __net_exit void l2tp_exit_net(struct net *net) rcu_read_lock_bh(); list_for_each_entry_rcu(tunnel, &pn->l2tp_tunnel_list, list) { - (void)l2tp_tunnel_delete(tunnel); + l2tp_tunnel_delete(tunnel); } rcu_read_unlock_bh(); diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index 7135f4645d3a..c28223d8092b 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -282,7 +282,7 @@ static int l2tp_nl_cmd_tunnel_delete(struct sk_buff *skb, struct genl_info *info l2tp_tunnel_notify(&l2tp_nl_family, info, tunnel, L2TP_CMD_TUNNEL_DELETE); - (void) l2tp_tunnel_delete(tunnel); + l2tp_tunnel_delete(tunnel); l2tp_tunnel_dec_refcount(tunnel);
l2tp_tunnel_delete does not return anything since commit 62b982eeb458 ("l2tp: fix race condition in l2tp_tunnel_delete"). But call sites of l2tp_tunnel_delete still do casts to void to avoid unused return value warnings. Kill these now useless casts. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Sabrina Dubroca <sd@queasysnail.net> Cc: Guillaume Nault <g.nault@alphalink.fr> Cc: David S. Miller <davem@davemloft.net> Cc: netdev@vger.kernel.org --- net/l2tp/l2tp_core.c | 2 +- net/l2tp/l2tp_netlink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)