aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-09-30 09:29:37 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-09-30 09:40:24 -0300
commite847bbbf9273533c15c6e8aab204ba62c238cf42 (patch)
tree29fd2de2af1d3cc125c626287edb4495165de373
parent71932fb5f66223b0c320e96beaf375274de9c42e (diff)
V4L/DVB: v4l2-common: Move v4l2_find_nearest_format from videodev2.h to v4l2-common.h
This function is an internal API and belongs in v4l2-common.h, not videodev.h. The return pointer and probe argument should be const as well. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/v4l2-common.c7
-rw-r--r--include/linux/videodev2.h8
-rw-r--r--include/media/v4l2-common.h10
3 files changed, 14 insertions, 11 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 127cf068dd4e..45ee7d0f70f6 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -676,12 +676,13 @@ int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info)
}
EXPORT_SYMBOL_GPL(v4l_fill_dv_preset_info);
-struct v4l2_frmsize_discrete *v4l2_find_nearest_format(struct v4l2_discrete_probe *probe,
- s32 width, s32 height)
+const struct v4l2_frmsize_discrete *v4l2_find_nearest_format(
+ const struct v4l2_discrete_probe *probe,
+ s32 width, s32 height)
{
int i;
u32 error, min_error = UINT_MAX;
- struct v4l2_frmsize_discrete *size, *best = NULL;
+ const struct v4l2_frmsize_discrete *size, *best = NULL;
if (!probe)
return best;
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 957d5b093847..b06479f63271 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -397,14 +397,6 @@ struct v4l2_frmsize_discrete {
__u32 height; /* Frame height [pixel] */
};
-struct v4l2_discrete_probe {
- const struct v4l2_frmsize_discrete *sizes;
- int num_sizes;
-};
-
-struct v4l2_frmsize_discrete *v4l2_find_nearest_format(struct v4l2_discrete_probe *probe,
- s32 width, s32 height);
-
struct v4l2_frmsize_stepwise {
__u32 min_width; /* Minimum frame width [pixel] */
__u32 max_width; /* Maximum frame width [pixel] */
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 98b32645e5a7..41dd480e45f1 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -232,4 +232,14 @@ void v4l_bound_align_image(unsigned int *w, unsigned int wmin,
unsigned int hmax, unsigned int halign,
unsigned int salign);
int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info);
+
+struct v4l2_discrete_probe {
+ const struct v4l2_frmsize_discrete *sizes;
+ int num_sizes;
+};
+
+const struct v4l2_frmsize_discrete *v4l2_find_nearest_format(
+ const struct v4l2_discrete_probe *probe,
+ s32 width, s32 height);
+
#endif /* V4L2_COMMON_H_ */

Privacy Policy