net: annotate ->poll() instances

[linux-2.6-block.git] / net / nfc / llcp_sock.c

diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index fb7afcaa30047dbb3c1dd6287317c4ad7d3b186e..985909f105eb784fa41829e7703c6b236b3481fa 100644 (file)
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -531,7 +531,7 @@ static int llcp_sock_getname(struct socket *sock, struct sockaddr *uaddr,
        return 0;
 }
 
-static inline unsigned int llcp_accept_poll(struct sock *parent)
+static inline __poll_t llcp_accept_poll(struct sock *parent)
 {
        struct nfc_llcp_sock *llcp_sock, *parent_sock;
        struct sock *sk;
@@ -549,11 +549,11 @@ static inline unsigned int llcp_accept_poll(struct sock *parent)
        return 0;
 }
 
-static unsigned int llcp_sock_poll(struct file *file, struct socket *sock,
+static __poll_t llcp_sock_poll(struct file *file, struct socket *sock,
                                   poll_table *wait)
 {
        struct sock *sk = sock->sk;
-       unsigned int mask = 0;
+       __poll_t mask = 0;
 
        pr_debug("%p\n", sk);