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>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index bc198f84b9cd..6d53af00190e 100644
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -1179,7 +1179,7 @@ static __poll_t dvb_demux_poll(struct file *file, poll_table *wait)
         __poll_t mask = 0;
 
         if ((!dmxdevfilter) || dmxdevfilter->dev->exit)
-                return POLLERR;
+                return EPOLLERR;
         if (dvb_vb2_is_streaming(&dmxdevfilter->vb2_ctx))
                 return dvb_vb2_poll(&dmxdevfilter->vb2_ctx, file, wait);
 
@@ -1191,10 +1191,10 @@ static __poll_t dvb_demux_poll(struct file *file, poll_table *wait)
                 return 0;
 
         if (dmxdevfilter->buffer.error)
-                mask |= (POLLIN | POLLRDNORM | POLLPRI | POLLERR);
+                mask |= (EPOLLIN | EPOLLRDNORM | EPOLLPRI | EPOLLERR);
 
         if (!dvb_ringbuffer_empty(&dmxdevfilter->buffer))
-                mask |= (POLLIN | POLLRDNORM | POLLPRI);
+                mask |= (EPOLLIN | EPOLLRDNORM | EPOLLPRI);
 
         return mask;
 }
@@ -1331,7 +1331,7 @@ static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait)
         dprintk("%s\n", __func__);
 
         if (dmxdev->exit)
-                return POLLERR;
+                return EPOLLERR;
         if (dvb_vb2_is_streaming(&dmxdev->dvr_vb2_ctx))
                 return dvb_vb2_poll(&dmxdev->dvr_vb2_ctx, file, wait);
 
@@ -1343,12 +1343,12 @@ static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait)
 #endif
         if (need_ringbuffer) {
                 if (dmxdev->dvr_buffer.error)
-                        mask |= (POLLIN | POLLRDNORM | POLLPRI | POLLERR);
+                        mask |= (EPOLLIN | EPOLLRDNORM | EPOLLPRI | EPOLLERR);
 
                 if (!dvb_ringbuffer_empty(&dmxdev->dvr_buffer))
-                        mask |= (POLLIN | POLLRDNORM | POLLPRI);
+                        mask |= (EPOLLIN | EPOLLRDNORM | EPOLLPRI);
         } else
-                mask |= (POLLOUT | POLLWRNORM | POLLPRI);
+                mask |= (EPOLLOUT | EPOLLWRNORM | EPOLLPRI);
 
         return mask;
 }