net/atm: convert to ->poll_mask

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/net/atm/common.c b/net/atm/common.c
index fc78a0508ae1b3f78019bd0312a61b2cd0da6192..1f2af59935db356c003cfa8dd7d1bce388fada53 100644 (file)
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -648,16 +648,11 @@ out:
        return error;
 }
 
-__poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
+__poll_t vcc_poll_mask(struct socket *sock, __poll_t events)
 {
        struct sock *sk = sock->sk;
-       struct atm_vcc *vcc;
-       __poll_t mask;
-
-       sock_poll_wait(file, sk_sleep(sk), wait);
-       mask = 0;
-
-       vcc = ATM_SD(sock);
+       struct atm_vcc *vcc = ATM_SD(sock);
+       __poll_t mask = 0;
 
        /* exceptional events */
        if (sk->sk_err)

diff --git a/net/atm/common.h b/net/atm/common.h
index 5850649068bb29b3d688b4c8e29373b4a7f7592d..526796ad230fc6a2dbdca37f0d4f66f4edf47f17 100644 (file)
--- a/net/atm/common.h
+++ b/net/atm/common.h
@@ -17,7 +17,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci);
 int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
                int flags);
 int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len);
-__poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait);
+__poll_t vcc_poll_mask(struct socket *sock, __poll_t events);
 int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 int vcc_setsockopt(struct socket *sock, int level, int optname,

diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index 2cb10af16afcf8eeb925bfe1aab33e839821109a..9f75092fe7785c080b2a32f9c2c8b147056bd488 100644 (file)
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -113,7 +113,7 @@ static const struct proto_ops pvc_proto_ops = {
        .socketpair =   sock_no_socketpair,
        .accept =       sock_no_accept,
        .getname =      pvc_getname,
-       .poll =         vcc_poll,
+       .poll_mask =    vcc_poll_mask,
        .ioctl =        vcc_ioctl,
 #ifdef CONFIG_COMPAT
        .compat_ioctl = vcc_compat_ioctl,

diff --git a/net/atm/svc.c b/net/atm/svc.c
index 2f91b766ac423c97a0b9c1fd340222e31b17eefa..53f4ad7087b169bccbd8d0b86c7463fd77204a8d 100644 (file)
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -636,7 +636,7 @@ static const struct proto_ops svc_proto_ops = {
        .socketpair =   sock_no_socketpair,
        .accept =       svc_accept,
        .getname =      svc_getname,
-       .poll =         vcc_poll,
+       .poll_mask =    vcc_poll_mask,
        .ioctl =        svc_ioctl,
 #ifdef CONFIG_COMPAT
        .compat_ioctl = svc_compat_ioctl,