summaryrefslogtreecommitdiff
path: root/include/media/dvb_vb2.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2018-01-02 11:04:56 +1100
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-06 14:24:51 -0800
commitb46dc8ae17a427c50c00241898832807576fd28a (patch)
tree58982d6e07e5af2a1a6e5dbb15c3646e90ddf11f /include/media/dvb_vb2.h
parent68c5735eaa5e680e701c9a2d1e3c7880bdf5ab66 (diff)
downloadlwn-b46dc8ae17a427c50c00241898832807576fd28a.tar.gz
lwn-b46dc8ae17a427c50c00241898832807576fd28a.zip
media: videobuf2: fix up for "media: annotate ->poll() instances"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/media/dvb_vb2.h')
-rw-r--r--include/media/dvb_vb2.h10
1 files changed, 5 insertions, 5 deletions
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
/**