summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-07-30 09:42:10 +0200
committerDavid S. Miller <davem@davemloft.net>2018-07-30 18:10:25 +0200
commitdd979b4df817e9976f18fb6f9d134d6bc4a3c317 (patch)
treefffcfba952d7c3d86fbecaf5a14a213bd0d54967 /net/nfc
parentact_bpf: Use kmemdup instead of duplicating it in tcf_bpf_init_from_ops (diff)
downloadlinux-dd979b4df817e9976f18fb6f9d134d6bc4a3c317.tar.xz
linux-dd979b4df817e9976f18fb6f9d134d6bc4a3c317.zip
net: simplify sock_poll_wait
The wait_address argument is always directly derived from the filp argument, so remove it. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/llcp_sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index ea0c0c6f1874..dd4adf8b1167 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -556,7 +556,7 @@ static __poll_t llcp_sock_poll(struct file *file, struct socket *sock,
pr_debug("%p\n", sk);
- sock_poll_wait(file, sk_sleep(sk), wait);
+ sock_poll_wait(file, wait);
if (sk->sk_state == LLCP_LISTEN)
return llcp_accept_poll(sk);