summaryrefslogtreecommitdiffstats
path: root/net/atm/common.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-12-31 16:35:22 +0100
committerChristoph Hellwig <hch@lst.de>2018-05-26 09:16:44 +0200
commit9f728af35fadf6e2b535daaf5897cdaec9a51681 (patch)
tree3c6dc424b1b450712c9120a1d19e98b92550a2bf /net/atm/common.c
parentf4335f52bb9e4e257e5a6426cdecef786f5739b7 (diff)
downloadlinux-9f728af35fadf6e2b535daaf5897cdaec9a51681.tar.bz2
net/atm: convert to ->poll_mask
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'net/atm/common.c')
-rw-r--r--net/atm/common.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/net/atm/common.c b/net/atm/common.c
index fc78a0508ae1..1f2af59935db 100644
--- 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)