diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-02-15 13:18:04 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-24 12:37:10 -0400 |
commit | 2d80647b6ebd2db6ef1df5e4e3319afd8867580c (patch) | |
tree | ffede6e6b73b19b98d6b0194b40c17696f6a4855 /drivers/media/v4l2-core | |
parent | 1f1aed2ed4450381a322f5e727e89bd21e7a89fe (diff) |
[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>
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r-- | drivers/media/v4l2-core/v4l2-common.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c index aa044f491666..b81f274e60b0 100644 --- 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, | |||
551 | EXPORT_SYMBOL_GPL(v4l_bound_align_image); | 551 | EXPORT_SYMBOL_GPL(v4l_bound_align_image); |
552 | 552 | ||
553 | /** | 553 | /** |
554 | * v4l_fill_dv_preset_info - fill description of a digital video preset | ||
555 | * @preset - preset value | ||
556 | * @info - pointer to struct v4l2_dv_enum_preset | ||
557 | * | ||
558 | * drivers can use this helper function to fill description of dv preset | ||
559 | * in info. | ||
560 | */ | ||
561 | int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info) | ||
562 | { | ||
563 | static const struct v4l2_dv_preset_info { | ||
564 | u16 width; | ||
565 | u16 height; | ||
566 | const char *name; | ||
567 | } dv_presets[] = { | ||
568 | { 0, 0, "Invalid" }, /* V4L2_DV_INVALID */ | ||
569 | { 720, 480, "480p@59.94" }, /* V4L2_DV_480P59_94 */ | ||
570 | { 720, 576, "576p@50" }, /* V4L2_DV_576P50 */ | ||
571 | { 1280, 720, "720p@24" }, /* V4L2_DV_720P24 */ | ||
572 | { 1280, 720, "720p@25" }, /* V4L2_DV_720P25 */ | ||
573 | { 1280, 720, "720p@30" }, /* V4L2_DV_720P30 */ | ||
574 | { 1280, 720, "720p@50" }, /* V4L2_DV_720P50 */ | ||
575 | { 1280, 720, "720p@59.94" }, /* V4L2_DV_720P59_94 */ | ||
576 | { 1280, 720, "720p@60" }, /* V4L2_DV_720P60 */ | ||
577 | { 1920, 1080, "1080i@29.97" }, /* V4L2_DV_1080I29_97 */ | ||
578 | { 1920, 1080, "1080i@30" }, /* V4L2_DV_1080I30 */ | ||
579 | { 1920, 1080, "1080i@25" }, /* V4L2_DV_1080I25 */ | ||
580 | { 1920, 1080, "1080i@50" }, /* V4L2_DV_1080I50 */ | ||
581 | { 1920, 1080, "1080i@60" }, /* V4L2_DV_1080I60 */ | ||
582 | { 1920, 1080, "1080p@24" }, /* V4L2_DV_1080P24 */ | ||
583 | { 1920, 1080, "1080p@25" }, /* V4L2_DV_1080P25 */ | ||
584 | { 1920, 1080, "1080p@30" }, /* V4L2_DV_1080P30 */ | ||
585 | { 1920, 1080, "1080p@50" }, /* V4L2_DV_1080P50 */ | ||
586 | { 1920, 1080, "1080p@60" }, /* V4L2_DV_1080P60 */ | ||
587 | }; | ||
588 | |||
589 | if (info == NULL || preset >= ARRAY_SIZE(dv_presets)) | ||
590 | return -EINVAL; | ||
591 | |||
592 | info->preset = preset; | ||
593 | info->width = dv_presets[preset].width; | ||
594 | info->height = dv_presets[preset].height; | ||
595 | strlcpy(info->name, dv_presets[preset].name, sizeof(info->name)); | ||
596 | return 0; | ||
597 | } | ||
598 | EXPORT_SYMBOL_GPL(v4l_fill_dv_preset_info); | ||
599 | |||
600 | /** | ||
601 | * v4l_match_dv_timings - check if two timings match | 554 | * v4l_match_dv_timings - check if two timings match |
602 | * @t1 - compare this v4l2_dv_timings struct... | 555 | * @t1 - compare this v4l2_dv_timings struct... |
603 | * @t2 - with this struct. | 556 | * @t2 - with this struct. |