[poll] annotate SAA6588_CMD_POLL users
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Родитель
7928b2cbe5
Коммит
37b3c6a640
|
@ -411,9 +411,9 @@ static long saa6588_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
|
|||
break;
|
||||
/* --- poll() for /dev/radio --- */
|
||||
case SAA6588_CMD_POLL:
|
||||
a->result = 0;
|
||||
a->poll_mask = 0;
|
||||
if (s->data_available_for_read)
|
||||
a->result |= EPOLLIN | EPOLLRDNORM;
|
||||
a->poll_mask |= EPOLLIN | EPOLLRDNORM;
|
||||
poll_wait(a->instance, &s->read_queue, a->event_list);
|
||||
break;
|
||||
|
||||
|
|
|
@ -3344,10 +3344,10 @@ static __poll_t radio_poll(struct file *file, poll_table *wait)
|
|||
radio_enable(btv);
|
||||
cmd.instance = file;
|
||||
cmd.event_list = wait;
|
||||
cmd.result = res;
|
||||
cmd.poll_mask = res;
|
||||
bttv_call_all(btv, core, ioctl, SAA6588_CMD_POLL, &cmd);
|
||||
|
||||
return cmd.result;
|
||||
return cmd.poll_mask;
|
||||
}
|
||||
|
||||
static const struct v4l2_file_operations radio_fops =
|
||||
|
|
|
@ -1235,12 +1235,12 @@ static __poll_t radio_poll(struct file *file, poll_table *wait)
|
|||
|
||||
cmd.instance = file;
|
||||
cmd.event_list = wait;
|
||||
cmd.result = 0;
|
||||
cmd.poll_mask = 0;
|
||||
mutex_lock(&dev->lock);
|
||||
saa_call_all(dev, core, ioctl, SAA6588_CMD_POLL, &cmd);
|
||||
mutex_unlock(&dev->lock);
|
||||
|
||||
return rc | cmd.result;
|
||||
return rc | cmd.poll_mask;
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
|
|
@ -32,6 +32,7 @@ struct saa6588_command {
|
|||
unsigned char __user *buffer;
|
||||
struct file *instance;
|
||||
poll_table *event_list;
|
||||
__poll_t poll_mask;
|
||||
};
|
||||
|
||||
/* These ioctls are internal to the kernel */
|
||||
|
|
Загрузка…
Ссылка в новой задаче