diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa6752hs.c')
-rw-r--r-- | drivers/media/video/saa7134/saa6752hs.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c index 852040b6b5a6..40fd31ca7716 100644 --- a/drivers/media/video/saa7134/saa6752hs.c +++ b/drivers/media/video/saa7134/saa6752hs.c | |||
@@ -860,16 +860,6 @@ static int saa6752hs_g_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefm | |||
860 | return 0; | 860 | return 0; |
861 | } | 861 | } |
862 | 862 | ||
863 | static int saa6752hs_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) | ||
864 | { | ||
865 | struct v4l2_mbus_framefmt mbus_fmt; | ||
866 | int err = saa6752hs_g_mbus_fmt(sd, &mbus_fmt); | ||
867 | |||
868 | f->fmt.pix.width = mbus_fmt.width; | ||
869 | f->fmt.pix.height = mbus_fmt.height; | ||
870 | return err; | ||
871 | } | ||
872 | |||
873 | static int saa6752hs_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f) | 863 | static int saa6752hs_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f) |
874 | { | 864 | { |
875 | struct saa6752hs_state *h = to_state(sd); | 865 | struct saa6752hs_state *h = to_state(sd); |
@@ -917,16 +907,6 @@ static int saa6752hs_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefm | |||
917 | return 0; | 907 | return 0; |
918 | } | 908 | } |
919 | 909 | ||
920 | static int saa6752hs_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) | ||
921 | { | ||
922 | struct v4l2_mbus_framefmt mbus_fmt; | ||
923 | |||
924 | mbus_fmt.width = f->fmt.pix.width; | ||
925 | mbus_fmt.height = f->fmt.pix.height; | ||
926 | mbus_fmt.code = V4L2_MBUS_FMT_FIXED; | ||
927 | return saa6752hs_s_mbus_fmt(sd, &mbus_fmt); | ||
928 | } | ||
929 | |||
930 | static int saa6752hs_s_std(struct v4l2_subdev *sd, v4l2_std_id std) | 910 | static int saa6752hs_s_std(struct v4l2_subdev *sd, v4l2_std_id std) |
931 | { | 911 | { |
932 | struct saa6752hs_state *h = to_state(sd); | 912 | struct saa6752hs_state *h = to_state(sd); |
@@ -958,8 +938,6 @@ static const struct v4l2_subdev_core_ops saa6752hs_core_ops = { | |||
958 | }; | 938 | }; |
959 | 939 | ||
960 | static const struct v4l2_subdev_video_ops saa6752hs_video_ops = { | 940 | static const struct v4l2_subdev_video_ops saa6752hs_video_ops = { |
961 | .s_fmt = saa6752hs_s_fmt, | ||
962 | .g_fmt = saa6752hs_g_fmt, | ||
963 | .s_mbus_fmt = saa6752hs_s_mbus_fmt, | 941 | .s_mbus_fmt = saa6752hs_s_mbus_fmt, |
964 | .g_mbus_fmt = saa6752hs_g_mbus_fmt, | 942 | .g_mbus_fmt = saa6752hs_g_mbus_fmt, |
965 | }; | 943 | }; |