mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
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 <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
ee5daa1361
commit
a9a08845e9
297 changed files with 913 additions and 913 deletions
|
|
@ -246,7 +246,7 @@ static __poll_t snd_usb_sbrc_hwdep_poll(struct snd_hwdep *hw, struct file *file,
|
|||
struct usb_mixer_interface *mixer = hw->private_data;
|
||||
|
||||
poll_wait(file, &mixer->rc_waitq, wait);
|
||||
return mixer->rc_code ? POLLIN | POLLRDNORM : 0;
|
||||
return mixer->rc_code ? EPOLLIN | EPOLLRDNORM : 0;
|
||||
}
|
||||
|
||||
static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer)
|
||||
|
|
|
|||
|
|
@ -280,7 +280,7 @@ static __poll_t usb_stream_hwdep_poll(struct snd_hwdep *hw,
|
|||
|
||||
poll_wait(file, &us122l->sk.sleep, wait);
|
||||
|
||||
mask = POLLIN | POLLOUT | POLLWRNORM | POLLERR;
|
||||
mask = EPOLLIN | EPOLLOUT | EPOLLWRNORM | EPOLLERR;
|
||||
if (mutex_trylock(&us122l->mutex)) {
|
||||
struct usb_stream *s = us122l->sk.s;
|
||||
if (s && s->state == usb_stream_ready) {
|
||||
|
|
@ -290,7 +290,7 @@ static __poll_t usb_stream_hwdep_poll(struct snd_hwdep *hw,
|
|||
polled = &us122l->second_periods_polled;
|
||||
if (*polled != s->periods_done) {
|
||||
*polled = s->periods_done;
|
||||
mask = POLLIN | POLLOUT | POLLWRNORM;
|
||||
mask = EPOLLIN | EPOLLOUT | EPOLLWRNORM;
|
||||
} else
|
||||
mask = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,12 +92,12 @@ static __poll_t snd_us428ctls_poll(struct snd_hwdep *hw, struct file *file, poll
|
|||
struct usX2Ydev *us428 = hw->private_data;
|
||||
struct us428ctls_sharedmem *shm = us428->us428ctls_sharedmem;
|
||||
if (us428->chip_status & USX2Y_STAT_CHIP_HUP)
|
||||
return POLLHUP;
|
||||
return EPOLLHUP;
|
||||
|
||||
poll_wait(file, &us428->us428ctls_wait_queue_head, wait);
|
||||
|
||||
if (shm != NULL && shm->CtlSnapShotLast != shm->CtlSnapShotRed)
|
||||
mask |= POLLIN;
|
||||
mask |= EPOLLIN;
|
||||
|
||||
return mask;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue