annotate poll_table_struct ->_key
Only POLL... bitmaps ever end up there and their only use is checking for POLL... bits in them. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
3ad6f93e98
commit
0169943775
@ -163,7 +163,7 @@ static unsigned int dma_buf_poll(struct file *file, poll_table *poll)
|
||||
struct reservation_object *resv;
|
||||
struct reservation_object_list *fobj;
|
||||
struct dma_fence *fence_excl;
|
||||
unsigned long events;
|
||||
__poll_t events;
|
||||
unsigned shared_count, seq;
|
||||
|
||||
dmabuf = file->private_data;
|
||||
|
@ -2961,7 +2961,7 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait)
|
||||
struct bttv_buffer *buf;
|
||||
enum v4l2_field field;
|
||||
unsigned int rc = 0;
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
|
||||
if (v4l2_event_pending(&fh->fh))
|
||||
rc = POLLPRI;
|
||||
@ -3333,7 +3333,7 @@ static unsigned int radio_poll(struct file *file, poll_table *wait)
|
||||
{
|
||||
struct bttv_fh *fh = file->private_data;
|
||||
struct bttv *btv = fh->btv;
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
struct saa6588_command cmd;
|
||||
unsigned int res = 0;
|
||||
|
||||
|
@ -604,7 +604,7 @@ ssize_t cx18_v4l2_read(struct file *filp, char __user *buf, size_t count,
|
||||
|
||||
unsigned int cx18_v4l2_enc_poll(struct file *filp, poll_table *wait)
|
||||
{
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
struct cx18_open_id *id = file2id(filp);
|
||||
struct cx18 *cx = id->cx;
|
||||
struct cx18_stream *s = &cx->streams[id->type];
|
||||
|
@ -766,7 +766,7 @@ unsigned int ivtv_v4l2_dec_poll(struct file *filp, poll_table *wait)
|
||||
|
||||
unsigned int ivtv_v4l2_enc_poll(struct file *filp, poll_table *wait)
|
||||
{
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
struct ivtv_open_id *id = fh2id(filp->private_data);
|
||||
struct ivtv *itv = id->itv;
|
||||
struct ivtv_stream *s = &itv->streams[id->type];
|
||||
|
@ -911,7 +911,7 @@ err:
|
||||
|
||||
static unsigned int fops_poll(struct file *file, poll_table *wait)
|
||||
{
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
struct saa7164_encoder_fh *fh =
|
||||
(struct saa7164_encoder_fh *)file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
|
@ -1268,7 +1268,7 @@ static unsigned int viu_poll(struct file *file, struct poll_table_struct *wait)
|
||||
struct viu_fh *fh = file->private_data;
|
||||
struct videobuf_queue *q = &fh->vb_vidq;
|
||||
struct viu_dev *dev = fh->dev;
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
unsigned int res = v4l2_ctrl_poll(file, wait);
|
||||
|
||||
if (V4L2_BUF_TYPE_VIDEO_CAPTURE != fh->type)
|
||||
|
@ -484,7 +484,7 @@ static int cadet_release(struct file *file)
|
||||
static unsigned int cadet_poll(struct file *file, struct poll_table_struct *wait)
|
||||
{
|
||||
struct cadet *dev = video_drvdata(file);
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
unsigned int res = v4l2_ctrl_poll(file, wait);
|
||||
|
||||
poll_wait(file, &dev->read_queue, wait);
|
||||
|
@ -1153,7 +1153,7 @@ static unsigned int si476x_radio_fops_poll(struct file *file,
|
||||
struct poll_table_struct *pts)
|
||||
{
|
||||
struct si476x_radio *radio = video_drvdata(file);
|
||||
unsigned long req_events = poll_requested_events(pts);
|
||||
__poll_t req_events = poll_requested_events(pts);
|
||||
unsigned int err = v4l2_ctrl_poll(file, pts);
|
||||
|
||||
if (req_events & (POLLIN | POLLRDNORM)) {
|
||||
|
@ -511,7 +511,7 @@ static unsigned int si470x_fops_poll(struct file *file,
|
||||
struct poll_table_struct *pts)
|
||||
{
|
||||
struct si470x_device *radio = video_drvdata(file);
|
||||
unsigned long req_events = poll_requested_events(pts);
|
||||
__poll_t req_events = poll_requested_events(pts);
|
||||
int retval = v4l2_ctrl_poll(file, pts);
|
||||
|
||||
if (req_events & (POLLIN | POLLRDNORM)) {
|
||||
|
@ -1815,7 +1815,7 @@ static ssize_t mpeg_read(struct file *file, char __user *data,
|
||||
static unsigned int mpeg_poll(struct file *file,
|
||||
struct poll_table_struct *wait)
|
||||
{
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
struct cx231xx_fh *fh = file->private_data;
|
||||
struct cx231xx *dev = fh->dev;
|
||||
unsigned int res = 0;
|
||||
|
@ -2008,7 +2008,7 @@ cx231xx_v4l2_read(struct file *filp, char __user *buf, size_t count,
|
||||
*/
|
||||
static unsigned int cx231xx_v4l2_poll(struct file *filp, poll_table *wait)
|
||||
{
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
struct cx231xx_fh *fh = filp->private_data;
|
||||
struct cx231xx *dev = fh->dev;
|
||||
unsigned res = 0;
|
||||
|
@ -1865,7 +1865,7 @@ out:
|
||||
static unsigned int dev_poll(struct file *file, poll_table *wait)
|
||||
{
|
||||
struct gspca_dev *gspca_dev = video_drvdata(file);
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
int ret = 0;
|
||||
|
||||
PDEBUG(D_FRAM, "poll");
|
||||
|
@ -523,7 +523,7 @@ err:
|
||||
|
||||
static unsigned int hdpvr_poll(struct file *filp, poll_table *wait)
|
||||
{
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
struct hdpvr_buffer *buf = NULL;
|
||||
struct hdpvr_device *dev = video_drvdata(filp);
|
||||
unsigned int mask = v4l2_ctrl_poll(filp, wait);
|
||||
|
@ -1426,7 +1426,7 @@ tm6000_read(struct file *file, char __user *data, size_t count, loff_t *pos)
|
||||
static unsigned int
|
||||
__tm6000_poll(struct file *file, struct poll_table_struct *wait)
|
||||
{
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
struct tm6000_fh *fh = file->private_data;
|
||||
struct tm6000_buffer *buf;
|
||||
int res = 0;
|
||||
|
@ -502,7 +502,7 @@ unsigned int v4l2_m2m_poll(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
|
||||
struct poll_table_struct *wait)
|
||||
{
|
||||
struct video_device *vfd = video_devdata(file);
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
struct vb2_queue *src_q, *dst_q;
|
||||
struct vb2_buffer *src_vb = NULL, *dst_vb = NULL;
|
||||
unsigned int rc = 0;
|
||||
|
@ -1122,7 +1122,7 @@ unsigned int videobuf_poll_stream(struct file *file,
|
||||
struct videobuf_queue *q,
|
||||
poll_table *wait)
|
||||
{
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
struct videobuf_buffer *buf = NULL;
|
||||
unsigned int rc = 0;
|
||||
|
||||
|
@ -2021,7 +2021,7 @@ EXPORT_SYMBOL_GPL(vb2_core_queue_release);
|
||||
unsigned int vb2_core_poll(struct vb2_queue *q, struct file *file,
|
||||
poll_table *wait)
|
||||
{
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
struct vb2_buffer *vb = NULL;
|
||||
unsigned long flags;
|
||||
|
||||
|
@ -674,7 +674,7 @@ EXPORT_SYMBOL_GPL(vb2_queue_release);
|
||||
unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait)
|
||||
{
|
||||
struct video_device *vfd = video_devdata(file);
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
unsigned int res = 0;
|
||||
|
||||
if (test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags)) {
|
||||
|
@ -544,7 +544,7 @@ static long mei_compat_ioctl(struct file *file,
|
||||
*/
|
||||
static unsigned int mei_poll(struct file *file, poll_table *wait)
|
||||
{
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
__poll_t req_events = poll_requested_events(wait);
|
||||
struct mei_cl *cl = file->private_data;
|
||||
struct mei_device *dev;
|
||||
unsigned int mask = 0;
|
||||
|
@ -438,7 +438,7 @@ get_max:
|
||||
|
||||
static inline void wait_key_set(poll_table *wait, unsigned long in,
|
||||
unsigned long out, unsigned long bit,
|
||||
unsigned int ll_flag)
|
||||
__poll_t ll_flag)
|
||||
{
|
||||
wait->_key = POLLEX_SET | ll_flag;
|
||||
if (in & bit)
|
||||
@ -454,7 +454,7 @@ static int do_select(int n, fd_set_bits *fds, struct timespec64 *end_time)
|
||||
poll_table *wait;
|
||||
int retval, i, timed_out = 0;
|
||||
u64 slack = 0;
|
||||
unsigned int busy_flag = net_busy_loop_on() ? POLL_BUSY_LOOP : 0;
|
||||
__poll_t busy_flag = net_busy_loop_on() ? POLL_BUSY_LOOP : 0;
|
||||
unsigned long busy_start = 0;
|
||||
|
||||
rcu_read_lock();
|
||||
|
@ -37,7 +37,7 @@ typedef void (*poll_queue_proc)(struct file *, wait_queue_head_t *, struct poll_
|
||||
*/
|
||||
typedef struct poll_table_struct {
|
||||
poll_queue_proc _qproc;
|
||||
unsigned long _key;
|
||||
__poll_t _key;
|
||||
} poll_table;
|
||||
|
||||
static inline void poll_wait(struct file * filp, wait_queue_head_t * wait_address, poll_table *p)
|
||||
@ -62,15 +62,15 @@ static inline bool poll_does_not_wait(const poll_table *p)
|
||||
* to be started implicitly on poll(). You typically only want to do that
|
||||
* if the application is actually polling for POLLIN and/or POLLOUT.
|
||||
*/
|
||||
static inline unsigned long poll_requested_events(const poll_table *p)
|
||||
static inline __poll_t poll_requested_events(const poll_table *p)
|
||||
{
|
||||
return p ? p->_key : ~0UL;
|
||||
return p ? p->_key : ~(__poll_t)0;
|
||||
}
|
||||
|
||||
static inline void init_poll_funcptr(poll_table *pt, poll_queue_proc qproc)
|
||||
{
|
||||
pt->_qproc = qproc;
|
||||
pt->_key = ~0UL; /* all events enabled */
|
||||
pt->_key = ~(__poll_t)0; /* all events enabled */
|
||||
}
|
||||
|
||||
struct poll_table_entry {
|
||||
|
Loading…
Reference in New Issue
Block a user