Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b46dc8ae authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

media: videobuf2: fix up for "media: annotate ->poll() instances" 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 68c5735e

drivers/media/dvb-core/dvb_vb2.c

+2 −2
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ int dvb_vb2_mmap(struct dvb_vb2_ctx *ctx, struct vm_area_struct *vma) 
	return 0;

}



unsigned int dvb_vb2_poll(struct dvb_vb2_ctx *ctx, struct file *file,

__poll_t dvb_vb2_poll(struct dvb_vb2_ctx *ctx, struct file *file,

		      poll_table *wait)

{

	dprintk(3, "[%s]\n", ctx->name);

include/media/dvb_vb2.h

+5 −5
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 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,

static inline __poll_t dvb_vb2_poll(struct dvb_vb2_ctx *ctx,

				    struct file *file,

				    poll_table *wait)

{
@@ -169,7 +169,7 @@ 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_t dvb_vb2_poll(struct dvb_vb2_ctx *ctx, struct file *file,

		      poll_table *wait);

#endif