vfs: do bulk POLL* -> EPOLL* replacement

This is the mindless scripted replacement of kernel use of POLL*
variables as described by Al, done by this script:

    for V in IN OUT PRI ERR RDNORM RDBAND WRNORM WRBAND HUP RDHUP NVAL MSG; do
        L=`git grep -l -w POLL$V | grep -v '^t' | grep -v /um/ | grep -v '^sa' | grep -v '/poll.h$'|grep -v '^D'`
        for f in $L; do sed -i "-es/^\([^\"]*\)\(\<POLL$V\>\)/\\1E\\2/" $f; done
    done

with de-mangling cleanups yet to come.

NOTE! On almost all architectures, the EPOLL* constants have the same
values as the POLL* constants do.  But they keyword here is "almost".
For various bad reasons they aren't the same, and epoll() doesn't
actually work quite correctly in some cases due to this on Sparc et al.

The next patch from Al will sort out the final differences, and we
should be all done.

Scripted-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

16 files changed, 32 insertions, 32 deletions

diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index a2a1c1478cd0..a5e2f9e557ea 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -241,7 +241,7 @@ static __poll_t apm_poll(struct file *fp, poll_table * wait)
         struct apm_user *as = fp->private_data;
 
         poll_wait(fp, &apm_waitqueue, wait);
-        return queue_empty(&as->queue) ? 0 : POLLIN | POLLRDNORM;
+        return queue_empty(&as->queue) ? 0 : EPOLLIN | EPOLLRDNORM;
 }
 
 /*
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index 2f92cc46698b..06749e295ada 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -414,7 +414,7 @@ static __poll_t dsp56k_poll(struct file *file, poll_table *wait)
         {
         case DSP56K_DEV_56001:
                 /* poll_wait(file, ???, wait); */
-                return POLLIN | POLLRDNORM | POLLOUT;
+                return EPOLLIN | EPOLLRDNORM | EPOLLOUT;
 
         default:
                 printk("DSP56k driver: Unknown minor device: %d\n", dev);
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index 2697c22e3be2..f882460b5a44 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -62,7 +62,7 @@
 #include <linux/uaccess.h>      /* for get_user, etc. */
 #include <linux/wait.h>         /* for wait_queue */
 #include <linux/init.h>         /* for __init, module_{init,exit} */
-#include <linux/poll.h>         /* for POLLIN, etc. */
+#include <linux/poll.h>         /* for EPOLLIN, etc. */
 #include <linux/dtlk.h>         /* local header file for DoubleTalk values */
 
 #ifdef TRACING
@@ -244,11 +244,11 @@ static __poll_t dtlk_poll(struct file *file, poll_table * wait)
 
         if (dtlk_has_indexing && dtlk_readable()) {
                 del_timer(&dtlk_timer);
-                mask = POLLIN | POLLRDNORM;
+                mask = EPOLLIN | EPOLLRDNORM;
         }
         if (dtlk_writeable()) {
                 del_timer(&dtlk_timer);
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
         }
         /* there are no exception conditions */
 
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index dbed4953f86c..be426eb2a353 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -359,7 +359,7 @@ static __poll_t hpet_poll(struct file *file, poll_table * wait)
         spin_unlock_irq(&hpet_lock);
 
         if (v != 0)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
 
         return 0;
 }
diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c
index 7992c870b0a2..c95b93b7598b 100644
--- a/drivers/char/ipmi/bt-bmc.c
+++ b/drivers/char/ipmi/bt-bmc.c
@@ -349,10 +349,10 @@ static __poll_t bt_bmc_poll(struct file *file, poll_table *wait)
         ctrl = bt_inb(bt_bmc, BT_CTRL);
 
         if (ctrl & BT_CTRL_H2B_ATN)
-                mask |= POLLIN;
+                mask |= EPOLLIN;
 
         if (!(ctrl & (BT_CTRL_H_BUSY | BT_CTRL_B2H_ATN)))
-                mask |= POLLOUT;
+                mask |= EPOLLOUT;
 
         return mask;
 }
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index a011a7739f5e..5f1bc9174735 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -89,7 +89,7 @@ static __poll_t ipmi_poll(struct file *file, poll_table *wait)
         spin_lock_irqsave(&priv->recv_msg_lock, flags);
 
         if (!list_empty(&(priv->recv_msgs)))
-                mask |= (POLLIN | POLLRDNORM);
+                mask |= (EPOLLIN | EPOLLRDNORM);
 
         spin_unlock_irqrestore(&priv->recv_msg_lock, flags);
 
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 34bc1f3ca414..a58acdcf7414 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -895,7 +895,7 @@ static __poll_t ipmi_poll(struct file *file, poll_table *wait)
 
         spin_lock(&ipmi_read_lock);
         if (data_to_read)
-                mask |= (POLLIN | POLLRDNORM);
+                mask |= (EPOLLIN | EPOLLRDNORM);
         spin_unlock(&ipmi_read_lock);
 
         return mask;
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 819fe37a3683..f80965407d3c 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -423,9 +423,9 @@ static __poll_t cm4040_poll(struct file *filp, poll_table *wait)
         poll_wait(filp, &dev->poll_wait, wait);
 
         if (test_and_clear_bit(BS_READABLE, &dev->buffer_status))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
         if (test_and_clear_bit(BS_WRITABLE, &dev->buffer_status))
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
 
         DEBUGP(2, dev, "<- cm4040_poll(%u)\n", mask);
 
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 7a56d1a13ec3..1ae77b41050a 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -776,7 +776,7 @@ static __poll_t pp_poll(struct file *file, poll_table *wait)
 
         poll_wait(file, &pp->irq_wait, wait);
         if (atomic_read(&pp->irqc))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
 
         return mask;
 }
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 80f2c326db47..e5b3d3ba4660 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1793,9 +1793,9 @@ random_poll(struct file *file, poll_table * wait)
         poll_wait(file, &random_write_wait, wait);
         mask = 0;
         if (ENTROPY_BITS(&input_pool) >= random_read_wakeup_bits)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
         if (ENTROPY_BITS(&input_pool) < random_write_wakeup_bits)
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
         return mask;
 }
 
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index c6a317120a55..0c858d027bf3 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -804,7 +804,7 @@ static __poll_t rtc_poll(struct file *file, poll_table *wait)
         spin_unlock_irq(&rtc_lock);
 
         if (l != 0)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
         return 0;
 }
 #endif
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index 7f49fa0f41d7..5918ea7499bb 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -340,10 +340,10 @@ scdrv_poll(struct file *file, struct poll_table_struct *wait)
 
         if (status > 0) {
                 if (status & SAL_IROUTER_INTR_RECV) {
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                 }
                 if (status & SAL_IROUTER_INTR_XMIT) {
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
                 }
         }
 
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index fc041c462aa4..186689833231 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -944,7 +944,7 @@ static __poll_t sonypi_misc_poll(struct file *file, poll_table *wait)
 {
         poll_wait(file, &sonypi_device.fifo_proc_list, wait);
         if (kfifo_len(&sonypi_device.fifo))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
         return 0;
 }
 
diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c
index 674218b50b13..e4f79f920450 100644
--- a/drivers/char/tpm/tpm_vtpm_proxy.c
+++ b/drivers/char/tpm/tpm_vtpm_proxy.c
@@ -180,15 +180,15 @@ static __poll_t vtpm_proxy_fops_poll(struct file *filp, poll_table *wait)
 
         poll_wait(filp, &proxy_dev->wq, wait);
 
-        ret = POLLOUT;
+        ret = EPOLLOUT;
 
         mutex_lock(&proxy_dev->buf_lock);
 
         if (proxy_dev->req_len)
-                ret |= POLLIN | POLLRDNORM;
+                ret |= EPOLLIN | EPOLLRDNORM;
 
         if (!(proxy_dev->state & STATE_OPENED_FLAG))
-                ret |= POLLHUP;
+                ret |= EPOLLHUP;
 
         mutex_unlock(&proxy_dev->buf_lock);
 
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 813a2e46824d..468f06134012 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -992,15 +992,15 @@ static __poll_t port_fops_poll(struct file *filp, poll_table *wait)
 
         if (!port->guest_connected) {
                 /* Port got unplugged */
-                return POLLHUP;
+                return EPOLLHUP;
         }
         ret = 0;
         if (!will_read_block(port))
-                ret |= POLLIN | POLLRDNORM;
+                ret |= EPOLLIN | EPOLLRDNORM;
         if (!will_write_block(port))
-                ret |= POLLOUT;
+                ret |= EPOLLOUT;
         if (!port->host_connected)
-                ret |= POLLHUP;
+                ret |= EPOLLHUP;
 
         return ret;
 }
diff --git a/drivers/char/xillybus/xillybus_core.c b/drivers/char/xillybus/xillybus_core.c
index 88e1cf475d3f..a11af94e2e65 100644
--- a/drivers/char/xillybus/xillybus_core.c
+++ b/drivers/char/xillybus/xillybus_core.c
@@ -1758,15 +1758,15 @@ static __poll_t xillybus_poll(struct file *filp, poll_table *wait)
 
                 spin_lock_irqsave(&channel->wr_spinlock, flags);
                 if (!channel->wr_empty || channel->wr_ready)
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
 
                 if (channel->wr_hangup)
                         /*
-                         * Not POLLHUP, because its behavior is in the
-                         * mist, and POLLIN does what we want: Wake up
+                         * Not EPOLLHUP, because its behavior is in the
+                         * mist, and EPOLLIN does what we want: Wake up
                          * the read file descriptor so it sees EOF.
                          */
-                        mask |=  POLLIN | POLLRDNORM;
+                        mask |=  EPOLLIN | EPOLLRDNORM;
                 spin_unlock_irqrestore(&channel->wr_spinlock, flags);
         }
 
@@ -1781,12 +1781,12 @@ static __poll_t xillybus_poll(struct file *filp, poll_table *wait)
 
                 spin_lock_irqsave(&channel->rd_spinlock, flags);
                 if (!channel->rd_full)
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
                 spin_unlock_irqrestore(&channel->rd_spinlock, flags);
         }
 
         if (channel->endpoint->fatal_error)
-                mask |= POLLERR;
+                mask |= EPOLLERR;
 
         return mask;
 }