Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] media: omap/omap_vout: fix type of input members to omap_vout_setup_vrfb_bufs()

the declaration for omap_vout_setup_vrfb_bufs() said it
needed 'u32 static_vrfb_allocation' but definition
took 'bool static_vrfb_allocation', this patch fixes the
declaration so that it matches with the definition and
pass a bool instead of int to the call, also included
omap_vout_vrfb.h in omap_vout_vrfb.c file so that sparse doesn't
complain of making omap_vout_setup_vrfb_bufs() as static function.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

authored by

Lad, Prabhakar and committed by
Mauro Carvalho Chehab
ac0b2b30 bb057a79

+4 -3
+1 -1
drivers/media/platform/omap/omap_vout.c
··· 1978 1978 vout->cropped_offset = 0; 1979 1979 1980 1980 if (ovid->rotation_type == VOUT_ROT_VRFB) { 1981 - int static_vrfb_allocation = (vid_num == 0) ? 1981 + bool static_vrfb_allocation = (vid_num == 0) ? 1982 1982 vid1_static_vrfb_alloc : vid2_static_vrfb_alloc; 1983 1983 ret = omap_vout_setup_vrfb_bufs(pdev, vid_num, 1984 1984 static_vrfb_allocation);
+1
drivers/media/platform/omap/omap_vout_vrfb.c
··· 21 21 22 22 #include "omap_voutdef.h" 23 23 #include "omap_voutlib.h" 24 + #include "omap_vout_vrfb.h" 24 25 25 26 #define OMAP_DMA_NO_DEVICE 0 26 27
+2 -2
drivers/media/platform/omap/omap_vout_vrfb.h
··· 15 15 #ifdef CONFIG_VIDEO_OMAP2_VOUT_VRFB 16 16 void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout); 17 17 int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num, 18 - u32 static_vrfb_allocation); 18 + bool static_vrfb_allocation); 19 19 void omap_vout_release_vrfb(struct omap_vout_device *vout); 20 20 int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout, 21 21 unsigned int *count, unsigned int startindex); ··· 25 25 #else 26 26 static inline void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout) { }; 27 27 static inline int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num, 28 - u32 static_vrfb_allocation) 28 + bool static_vrfb_allocation) 29 29 { return 0; }; 30 30 static inline void omap_vout_release_vrfb(struct omap_vout_device *vout) { }; 31 31 static inline int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout,