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

Commit 4bac2bcd authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

net/nfc: convert to ->poll_mask 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 9490e40a

net/nfc/llcp_sock.c

+3 −6
Original line number Diff line number Diff line
@@ -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,