vfs: do bulk POLL* -> EPOLL* replacement

[linux-2.6-block.git] / net / atm / common.c

diff --git a/net/atm/common.c b/net/atm/common.c
index 6523f38c4957f33a5400f753d348f510e48f4e4f..fc78a0508ae1b3f78019bd0312a61b2cd0da6192 100644 (file)
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -661,15 +661,15 @@ __poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
 
        /* exceptional events */
        if (sk->sk_err)
-               mask = POLLERR;
+               mask = EPOLLERR;
 
        if (test_bit(ATM_VF_RELEASED, &vcc->flags) ||
            test_bit(ATM_VF_CLOSE, &vcc->flags))
-               mask |= POLLHUP;
+               mask |= EPOLLHUP;
 
        /* readable? */
        if (!skb_queue_empty(&sk->sk_receive_queue))
-               mask |= POLLIN | POLLRDNORM;
+               mask |= EPOLLIN | EPOLLRDNORM;
 
        /* writable? */
        if (sock->state == SS_CONNECTING &&
@@ -678,7 +678,7 @@ __poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
 
        if (vcc->qos.txtp.traffic_class != ATM_NONE &&
            vcc_writable(sk))
-               mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+               mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
 
        return mask;
 }