summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-12-31 16:39:15 +0100
committerChristoph Hellwig <hch@lst.de>2018-05-26 09:16:44 +0200
commit4bac2bcd839605baf22e4c8b29e4e52156883e45 (patch)
tree5bebf687dd36cb2b66ef1a5710c1c8cee513a1e7 /net/nfc
parent9490e40a06aac3a86d4ae3a256beb9a813fdbe65 (diff)
downloadlinux-4bac2bcd839605baf22e4c8b29e4e52156883e45.tar.gz
linux-4bac2bcd839605baf22e4c8b29e4e52156883e45.tar.bz2
linux-4bac2bcd839605baf22e4c8b29e4e52156883e45.zip
net/nfc: convert to ->poll_mask
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/llcp_sock.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index ea0c0c6f1874..ab5bb14b49af 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -548,16 +548,13 @@ static inline __poll_t llcp_accept_poll(struct sock *parent)
return 0;
}
-static __poll_t llcp_sock_poll(struct file *file, struct socket *sock,
- poll_table *wait)
+static __poll_t llcp_sock_poll_mask(struct socket *sock, __poll_t events)
{
struct sock *sk = sock->sk;
__poll_t mask = 0;
pr_debug("%p\n", sk);
- sock_poll_wait(file, sk_sleep(sk), wait);
-
if (sk->sk_state == LLCP_LISTEN)
return llcp_accept_poll(sk);
@@ -899,7 +896,7 @@ static const struct proto_ops llcp_sock_ops = {
.socketpair = sock_no_socketpair,
.accept = llcp_sock_accept,
.getname = llcp_sock_getname,
- .poll = llcp_sock_poll,
+ .poll_mask = llcp_sock_poll_mask,
.ioctl = sock_no_ioctl,
.listen = llcp_sock_listen,
.shutdown = sock_no_shutdown,
@@ -919,7 +916,7 @@ static const struct proto_ops llcp_rawsock_ops = {
.socketpair = sock_no_socketpair,
.accept = sock_no_accept,
.getname = llcp_sock_getname,
- .poll = llcp_sock_poll,
+ .poll_mask = llcp_sock_poll_mask,
.ioctl = sock_no_ioctl,
.listen = sock_no_listen,
.shutdown = sock_no_shutdown,