[PATCH 24/30] net/iucv: convert to ->poll_mask

[Christoph Hellwig]

Signed-off-by: Christoph Hellwig 
---
 include/net/iucv/af_iucv.h | 2 --
 net/iucv/af_iucv.c | 7 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
index f4c21b5a1242..b0eaeb02d46d 100644
--- a/include/net/iucv/af_iucv.h
+++ b/include/net/iucv/af_iucv.h
@@ -153,8 +153,6 @@ struct iucv_sock_list {
atomic_t  autobind_name;
 };
 
-__poll_t iucv_sock_poll(struct file *file, struct socket *sock,
-   poll_table *wait);
 void iucv_sock_link(struct iucv_sock_list *l, struct sock *s);
 void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *s);
 void iucv_accept_enqueue(struct sock *parent, struct sock *sk);
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 1e8cc7bcbca3..539a312dc481 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1489,14 +1489,11 @@ static inline __poll_t iucv_accept_poll(struct sock 
*parent)
return 0;
 }
 
-__poll_t iucv_sock_poll(struct file *file, struct socket *sock,
-   poll_table *wait)
+static __poll_t iucv_sock_poll_mask(struct socket *sock, __poll_t events)
 {
struct sock *sk = sock->sk;
__poll_t mask = 0;
 
-   sock_poll_wait(file, sk_sleep(sk), wait);
-
if (sk->sk_state == IUCV_LISTEN)
return iucv_accept_poll(sk);
 
@@ -2389,7 +2386,7 @@ static const struct proto_ops iucv_sock_ops = {
.getname= iucv_sock_getname,
.sendmsg= iucv_sock_sendmsg,
.recvmsg= iucv_sock_recvmsg,
-   .poll   = iucv_sock_poll,
+   .poll_mask  = iucv_sock_poll_mask,
.ioctl  = sock_no_ioctl,
.mmap   = sock_no_mmap,
.socketpair = sock_no_socketpair,
-- 
2.14.2

[PATCH 24/30] net/iucv: convert to ->poll_mask

[Christoph Hellwig]

Signed-off-by: Christoph Hellwig 
---
 include/net/iucv/af_iucv.h | 2 --
 net/iucv/af_iucv.c | 7 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
index f4c21b5a1242..b0eaeb02d46d 100644
--- a/include/net/iucv/af_iucv.h
+++ b/include/net/iucv/af_iucv.h
@@ -153,8 +153,6 @@ struct iucv_sock_list {
atomic_t  autobind_name;
 };
 
-__poll_t iucv_sock_poll(struct file *file, struct socket *sock,
-   poll_table *wait);
 void iucv_sock_link(struct iucv_sock_list *l, struct sock *s);
 void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *s);
 void iucv_accept_enqueue(struct sock *parent, struct sock *sk);
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 1e8cc7bcbca3..539a312dc481 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1489,14 +1489,11 @@ static inline __poll_t iucv_accept_poll(struct sock 
*parent)
return 0;
 }
 
-__poll_t iucv_sock_poll(struct file *file, struct socket *sock,
-   poll_table *wait)
+static __poll_t iucv_sock_poll_mask(struct socket *sock, __poll_t events)
 {
struct sock *sk = sock->sk;
__poll_t mask = 0;
 
-   sock_poll_wait(file, sk_sleep(sk), wait);
-
if (sk->sk_state == IUCV_LISTEN)
return iucv_accept_poll(sk);
 
@@ -2389,7 +2386,7 @@ static const struct proto_ops iucv_sock_ops = {
.getname= iucv_sock_getname,
.sendmsg= iucv_sock_sendmsg,
.recvmsg= iucv_sock_recvmsg,
-   .poll   = iucv_sock_poll,
+   .poll_mask  = iucv_sock_poll_mask,
.ioctl  = sock_no_ioctl,
.mmap   = sock_no_mmap,
.socketpair = sock_no_socketpair,
-- 
2.14.2