diff options
author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2013-02-07 11:39:16 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-04 12:16:01 -0500 |
commit | aab346187662b3f2a11b1120896f688299c8ba43 (patch) | |
tree | 516597789aee81d682508be85d637ebc5815ced3 | |
parent | 430101bd8b9184496c57a8bffe9fc9d1c2b7732f (diff) |
[media] em28xx: get rid of duplicate function vidioc_s_fmt_vbi_cap()
vidioc_s_fmt_vbi_cap() is a 100% duplicate of vidioc_g_fmt_vbi_cap() and
therefore can be removed.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-video.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index ea73dd4e428a..8ddf3009c794 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c | |||
@@ -1480,35 +1480,6 @@ static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv, | |||
1480 | return 0; | 1480 | return 0; |
1481 | } | 1481 | } |
1482 | 1482 | ||
1483 | static int vidioc_s_fmt_vbi_cap(struct file *file, void *priv, | ||
1484 | struct v4l2_format *format) | ||
1485 | { | ||
1486 | struct em28xx_fh *fh = priv; | ||
1487 | struct em28xx *dev = fh->dev; | ||
1488 | |||
1489 | format->fmt.vbi.samples_per_line = dev->vbi_width; | ||
1490 | format->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY; | ||
1491 | format->fmt.vbi.offset = 0; | ||
1492 | format->fmt.vbi.flags = 0; | ||
1493 | format->fmt.vbi.sampling_rate = 6750000 * 4 / 2; | ||
1494 | format->fmt.vbi.count[0] = dev->vbi_height; | ||
1495 | format->fmt.vbi.count[1] = dev->vbi_height; | ||
1496 | memset(format->fmt.vbi.reserved, 0, sizeof(format->fmt.vbi.reserved)); | ||
1497 | |||
1498 | /* Varies by video standard (NTSC, PAL, etc.) */ | ||
1499 | if (dev->norm & V4L2_STD_525_60) { | ||
1500 | /* NTSC */ | ||
1501 | format->fmt.vbi.start[0] = 10; | ||
1502 | format->fmt.vbi.start[1] = 273; | ||
1503 | } else if (dev->norm & V4L2_STD_625_50) { | ||
1504 | /* PAL */ | ||
1505 | format->fmt.vbi.start[0] = 6; | ||
1506 | format->fmt.vbi.start[1] = 318; | ||
1507 | } | ||
1508 | |||
1509 | return 0; | ||
1510 | } | ||
1511 | |||
1512 | /* ----------------------------------------------------------- */ | 1483 | /* ----------------------------------------------------------- */ |
1513 | /* RADIO ESPECIFIC IOCTLS */ | 1484 | /* RADIO ESPECIFIC IOCTLS */ |
1514 | /* ----------------------------------------------------------- */ | 1485 | /* ----------------------------------------------------------- */ |
@@ -1707,7 +1678,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { | |||
1707 | .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, | 1678 | .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, |
1708 | .vidioc_g_fmt_vbi_cap = vidioc_g_fmt_vbi_cap, | 1679 | .vidioc_g_fmt_vbi_cap = vidioc_g_fmt_vbi_cap, |
1709 | .vidioc_try_fmt_vbi_cap = vidioc_g_fmt_vbi_cap, | 1680 | .vidioc_try_fmt_vbi_cap = vidioc_g_fmt_vbi_cap, |
1710 | .vidioc_s_fmt_vbi_cap = vidioc_s_fmt_vbi_cap, | 1681 | .vidioc_s_fmt_vbi_cap = vidioc_g_fmt_vbi_cap, |
1711 | .vidioc_enum_framesizes = vidioc_enum_framesizes, | 1682 | .vidioc_enum_framesizes = vidioc_enum_framesizes, |
1712 | .vidioc_g_audio = vidioc_g_audio, | 1683 | .vidioc_g_audio = vidioc_g_audio, |
1713 | .vidioc_s_audio = vidioc_s_audio, | 1684 | .vidioc_s_audio = vidioc_s_audio, |