anntotate the places where ->poll() return values go
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
a3f8683bf7
commit
e6c8adca20
|
@ -809,7 +809,7 @@ static unsigned int soc_camera_poll(struct file *file, poll_table *pt)
|
|||
{
|
||||
struct soc_camera_device *icd = file->private_data;
|
||||
struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
|
||||
unsigned res = POLLERR;
|
||||
__poll_t res = POLLERR;
|
||||
|
||||
if (icd->streamer != file)
|
||||
return POLLERR;
|
||||
|
|
|
@ -334,7 +334,7 @@ static ssize_t v4l2_write(struct file *filp, const char __user *buf,
|
|||
static unsigned int v4l2_poll(struct file *filp, struct poll_table_struct *poll)
|
||||
{
|
||||
struct video_device *vdev = video_devdata(filp);
|
||||
unsigned int res = POLLERR | POLLHUP;
|
||||
__poll_t res = POLLERR | POLLHUP;
|
||||
|
||||
if (!vdev->fops->poll)
|
||||
return DEFAULT_POLLMASK;
|
||||
|
|
|
@ -119,7 +119,7 @@ static void serial2002_tty_read_poll_wait(struct file *f, int timeout)
|
|||
poll_initwait(&table);
|
||||
while (1) {
|
||||
long elapsed;
|
||||
int mask;
|
||||
__poll_t mask;
|
||||
|
||||
mask = f->f_op->poll(f, &table.pt);
|
||||
if (mask & (POLLRDNORM | POLLRDBAND | POLLIN |
|
||||
|
|
|
@ -2059,7 +2059,7 @@ static unsigned int tty_poll(struct file *filp, poll_table *wait)
|
|||
{
|
||||
struct tty_struct *tty = file_tty(filp);
|
||||
struct tty_ldisc *ld;
|
||||
int ret = 0;
|
||||
__poll_t ret = 0;
|
||||
|
||||
if (tty_paranoia_check(tty, file_inode(filp), "tty_poll"))
|
||||
return 0;
|
||||
|
|
|
@ -113,7 +113,7 @@ int vfio_virqfd_enable(void *opaque,
|
|||
struct eventfd_ctx *ctx;
|
||||
struct virqfd *virqfd;
|
||||
int ret = 0;
|
||||
unsigned int events;
|
||||
__poll_t events;
|
||||
|
||||
virqfd = kzalloc(sizeof(*virqfd), GFP_KERNEL);
|
||||
if (!virqfd)
|
||||
|
|
|
@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(vhost_poll_init);
|
|||
* keep a reference to a file until after vhost_poll_stop is called. */
|
||||
int vhost_poll_start(struct vhost_poll *poll, struct file *file)
|
||||
{
|
||||
unsigned long mask;
|
||||
__poll_t mask;
|
||||
int ret = 0;
|
||||
|
||||
if (poll->wqh)
|
||||
|
@ -211,7 +211,7 @@ int vhost_poll_start(struct vhost_poll *poll, struct file *file)
|
|||
|
||||
mask = file->f_op->poll(file, &poll->table);
|
||||
if (mask)
|
||||
vhost_poll_wakeup(&poll->wait, 0, 0, (void *)mask);
|
||||
vhost_poll_wakeup(&poll->wait, 0, 0, (void *)(uintptr_t)mask);
|
||||
if (mask & POLLERR) {
|
||||
if (poll->wqh)
|
||||
remove_wait_queue(poll->wqh, &poll->wait);
|
||||
|
|
|
@ -210,7 +210,7 @@ static unsigned int full_proxy_poll(struct file *filp,
|
|||
struct poll_table_struct *wait)
|
||||
{
|
||||
struct dentry *dentry = F_DENTRY(filp);
|
||||
unsigned int r = 0;
|
||||
__poll_t r = 0;
|
||||
const struct file_operations *real_fops;
|
||||
|
||||
if (debugfs_file_get(dentry))
|
||||
|
|
|
@ -237,7 +237,7 @@ static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t
|
|||
static unsigned int proc_reg_poll(struct file *file, struct poll_table_struct *pts)
|
||||
{
|
||||
struct proc_dir_entry *pde = PDE(file_inode(file));
|
||||
unsigned int rv = DEFAULT_POLLMASK;
|
||||
__poll_t rv = DEFAULT_POLLMASK;
|
||||
__poll_t (*poll)(struct file *, struct poll_table_struct *);
|
||||
if (use_pde(pde)) {
|
||||
poll = pde->proc_fops->poll;
|
||||
|
|
|
@ -484,8 +484,9 @@ static int do_select(int n, fd_set_bits *fds, struct timespec64 *end_time)
|
|||
rinp = fds->res_in; routp = fds->res_out; rexp = fds->res_ex;
|
||||
|
||||
for (i = 0; i < n; ++rinp, ++routp, ++rexp) {
|
||||
unsigned long in, out, ex, all_bits, bit = 1, mask, j;
|
||||
unsigned long in, out, ex, all_bits, bit = 1, j;
|
||||
unsigned long res_in = 0, res_out = 0, res_ex = 0;
|
||||
__poll_t mask;
|
||||
|
||||
in = *inp++; out = *outp++; ex = *exp++;
|
||||
all_bits = in | out | ex;
|
||||
|
@ -806,7 +807,7 @@ static inline unsigned int do_pollfd(struct pollfd *pollfd, poll_table *pwait,
|
|||
bool *can_busy_poll,
|
||||
unsigned int busy_flag)
|
||||
{
|
||||
unsigned int mask;
|
||||
__poll_t mask;
|
||||
int fd;
|
||||
|
||||
mask = 0;
|
||||
|
|
|
@ -1130,7 +1130,7 @@ static unsigned int smc_poll(struct file *file, struct socket *sock,
|
|||
poll_table *wait)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
unsigned int mask = 0;
|
||||
__poll_t mask = 0;
|
||||
struct smc_sock *smc;
|
||||
int rc;
|
||||
|
||||
|
|
|
@ -1093,7 +1093,7 @@ EXPORT_SYMBOL(sock_create_lite);
|
|||
/* No kernel lock held - perfect */
|
||||
static unsigned int sock_poll(struct file *file, poll_table *wait)
|
||||
{
|
||||
unsigned int busy_flag = 0;
|
||||
__poll_t busy_flag = 0;
|
||||
struct socket *sock;
|
||||
|
||||
/*
|
||||
|
|
|
@ -287,7 +287,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
|
|||
struct fd f;
|
||||
struct eventfd_ctx *eventfd = NULL, *resamplefd = NULL;
|
||||
int ret;
|
||||
unsigned int events;
|
||||
__poll_t events;
|
||||
int idx;
|
||||
|
||||
if (!kvm_arch_intc_initialized(kvm))
|
||||
|
|
Loading…
Reference in a new issue