diff options
author | Lad, Prabhakar <prabhakar.csengg@gmail.com> | 2015-02-24 13:25:00 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-03-03 09:22:58 -0500 |
commit | ac0b2b3072bf81c2047beb39f1db7a7d745f2f99 (patch) | |
tree | 8bf3f85bcc817240d5c3cb93a92dd7e91543ddb6 /drivers/media/platform/omap | |
parent | bb057a791e4e3020b991956781669ff284fd3db6 (diff) |
[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>
Diffstat (limited to 'drivers/media/platform/omap')
-rw-r--r-- | drivers/media/platform/omap/omap_vout.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/omap/omap_vout_vrfb.c | 1 | ||||
-rw-r--r-- | drivers/media/platform/omap/omap_vout_vrfb.h | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index ba2d8f973d58..17b189a81ec5 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c | |||
@@ -1978,7 +1978,7 @@ static int __init omap_vout_setup_video_bufs(struct platform_device *pdev, | |||
1978 | vout->cropped_offset = 0; | 1978 | vout->cropped_offset = 0; |
1979 | 1979 | ||
1980 | if (ovid->rotation_type == VOUT_ROT_VRFB) { | 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 | vid1_static_vrfb_alloc : vid2_static_vrfb_alloc; | 1982 | vid1_static_vrfb_alloc : vid2_static_vrfb_alloc; |
1983 | ret = omap_vout_setup_vrfb_bufs(pdev, vid_num, | 1983 | ret = omap_vout_setup_vrfb_bufs(pdev, vid_num, |
1984 | static_vrfb_allocation); | 1984 | static_vrfb_allocation); |
diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/platform/omap/omap_vout_vrfb.c index aa39306afc73..c6e252760c62 100644 --- a/drivers/media/platform/omap/omap_vout_vrfb.c +++ b/drivers/media/platform/omap/omap_vout_vrfb.c | |||
@@ -21,6 +21,7 @@ | |||
21 | 21 | ||
22 | #include "omap_voutdef.h" | 22 | #include "omap_voutdef.h" |
23 | #include "omap_voutlib.h" | 23 | #include "omap_voutlib.h" |
24 | #include "omap_vout_vrfb.h" | ||
24 | 25 | ||
25 | #define OMAP_DMA_NO_DEVICE 0 | 26 | #define OMAP_DMA_NO_DEVICE 0 |
26 | 27 | ||
diff --git a/drivers/media/platform/omap/omap_vout_vrfb.h b/drivers/media/platform/omap/omap_vout_vrfb.h index 4c2314839b48..c976975024df 100644 --- a/drivers/media/platform/omap/omap_vout_vrfb.h +++ b/drivers/media/platform/omap/omap_vout_vrfb.h | |||
@@ -15,7 +15,7 @@ | |||
15 | #ifdef CONFIG_VIDEO_OMAP2_VOUT_VRFB | 15 | #ifdef CONFIG_VIDEO_OMAP2_VOUT_VRFB |
16 | void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout); | 16 | void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout); |
17 | int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num, | 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 | void omap_vout_release_vrfb(struct omap_vout_device *vout); | 19 | void omap_vout_release_vrfb(struct omap_vout_device *vout); |
20 | int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout, | 20 | int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout, |
21 | unsigned int *count, unsigned int startindex); | 21 | unsigned int *count, unsigned int startindex); |
@@ -25,7 +25,7 @@ void omap_vout_calculate_vrfb_offset(struct omap_vout_device *vout); | |||
25 | #else | 25 | #else |
26 | static inline void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout) { }; | 26 | static inline void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout) { }; |
27 | static inline int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num, | 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 | { return 0; }; | 29 | { return 0; }; |
30 | static inline void omap_vout_release_vrfb(struct omap_vout_device *vout) { }; | 30 | static inline void omap_vout_release_vrfb(struct omap_vout_device *vout) { }; |
31 | static inline int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout, | 31 | static inline int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout, |