From b46dc8ae17a427c50c00241898832807576fd28a Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 2 Jan 2018 11:04:56 +1100 Subject: media: videobuf2: fix up for "media: annotate ->poll() instances" Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds --- include/media/dvb_vb2.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/media') diff --git a/include/media/dvb_vb2.h b/include/media/dvb_vb2.h index dda61af7c4cd..01d1202d1a55 100644 --- a/include/media/dvb_vb2.h +++ b/include/media/dvb_vb2.h @@ -116,9 +116,9 @@ static inline int dvb_vb2_release(struct dvb_vb2_ctx *ctx) #define dvb_vb2_is_streaming(ctx) (0) #define dvb_vb2_fill_buffer(ctx, file, wait) (0) -static inline unsigned int dvb_vb2_poll(struct dvb_vb2_ctx *ctx, - struct file *file, - poll_table *wait) +static inline __poll_t dvb_vb2_poll(struct dvb_vb2_ctx *ctx, + struct file *file, + poll_table *wait) { return 0; } @@ -169,8 +169,8 @@ int dvb_vb2_fill_buffer(struct dvb_vb2_ctx *ctx, * * Implements poll syscall() logic. */ -unsigned int dvb_vb2_poll(struct dvb_vb2_ctx *ctx, struct file *file, - poll_table *wait); +__poll_t dvb_vb2_poll(struct dvb_vb2_ctx *ctx, struct file *file, + poll_table *wait); #endif /** -- cgit