[media] v4l2-common: remove obsolete v4l_fill_dv_preset_info

It's no longer used, so it can now be removed.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
index aa044f4..b81f274 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-common.c
+++ b/drivers/media/v4l2-core/v4l2-common.c
@@ -551,53 +551,6 @@ void v4l_bound_align_image(u32 *w, unsigned int wmin, unsigned int wmax,
 EXPORT_SYMBOL_GPL(v4l_bound_align_image);
 
 /**
- * v4l_fill_dv_preset_info - fill description of a digital video preset
- * @preset - preset value
- * @info - pointer to struct v4l2_dv_enum_preset
- *
- * drivers can use this helper function to fill description of dv preset
- * in info.
- */
-int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info)
-{
-       static const struct v4l2_dv_preset_info {
-               u16 width;
-               u16 height;
-               const char *name;
-       } dv_presets[] = {
-               { 0, 0, "Invalid" },            /* V4L2_DV_INVALID */
-               { 720,  480, "480p@59.94" },    /* V4L2_DV_480P59_94 */
-               { 720,  576, "576p@50" },       /* V4L2_DV_576P50 */
-               { 1280, 720, "720p@24" },       /* V4L2_DV_720P24 */
-               { 1280, 720, "720p@25" },       /* V4L2_DV_720P25 */
-               { 1280, 720, "720p@30" },       /* V4L2_DV_720P30 */
-               { 1280, 720, "720p@50" },       /* V4L2_DV_720P50 */
-               { 1280, 720, "720p@59.94" },    /* V4L2_DV_720P59_94 */
-               { 1280, 720, "720p@60" },       /* V4L2_DV_720P60 */
-               { 1920, 1080, "1080i@29.97" },  /* V4L2_DV_1080I29_97 */
-               { 1920, 1080, "1080i@30" },     /* V4L2_DV_1080I30 */
-               { 1920, 1080, "1080i@25" },     /* V4L2_DV_1080I25 */
-               { 1920, 1080, "1080i@50" },     /* V4L2_DV_1080I50 */
-               { 1920, 1080, "1080i@60" },     /* V4L2_DV_1080I60 */
-               { 1920, 1080, "1080p@24" },     /* V4L2_DV_1080P24 */
-               { 1920, 1080, "1080p@25" },     /* V4L2_DV_1080P25 */
-               { 1920, 1080, "1080p@30" },     /* V4L2_DV_1080P30 */
-               { 1920, 1080, "1080p@50" },     /* V4L2_DV_1080P50 */
-               { 1920, 1080, "1080p@60" },     /* V4L2_DV_1080P60 */
-       };
-
-       if (info == NULL || preset >= ARRAY_SIZE(dv_presets))
-               return -EINVAL;
-
-       info->preset = preset;
-       info->width = dv_presets[preset].width;
-       info->height = dv_presets[preset].height;
-       strlcpy(info->name, dv_presets[preset].name, sizeof(info->name));
-       return 0;
-}
-EXPORT_SYMBOL_GPL(v4l_fill_dv_preset_info);
-
-/**
  * v4l_match_dv_timings - check if two timings match
  * @t1 - compare this v4l2_dv_timings struct...
  * @t2 - with this struct.

diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index ec7c9c0..1d93c48 100644 (file)
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -201,7 +201,6 @@ void v4l_bound_align_image(unsigned int *w, unsigned int wmin,
                           unsigned int *h, unsigned int hmin,
                           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;