diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-04-13 06:47:12 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-16 17:03:09 -0400 |
commit | de9ea4cf7fd875460646f97c1f8addafe0454180 (patch) | |
tree | b078d09014e13aaba6be385d2439d6a3c6de4e41 /drivers/media/pci | |
parent | 95c232a24b73199f464e3234510ae4729196f38d (diff) |
[media] cx25821: remove cropping ioctls
This driver does not implement cropping, so remove the cropping ioctls.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r-- | drivers/media/pci/cx25821/cx25821-video.c | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c index 9e948eff6b88..9919a0e93f4d 100644 --- a/drivers/media/pci/cx25821/cx25821-video.c +++ b/drivers/media/pci/cx25821/cx25821-video.c | |||
@@ -1396,47 +1396,6 @@ static void cx25821_init_controls(struct cx25821_dev *dev, int chan_num) | |||
1396 | } | 1396 | } |
1397 | } | 1397 | } |
1398 | 1398 | ||
1399 | static int cx25821_vidioc_cropcap(struct file *file, void *priv, | ||
1400 | struct v4l2_cropcap *cropcap) | ||
1401 | { | ||
1402 | struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; | ||
1403 | |||
1404 | if (cropcap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
1405 | return -EINVAL; | ||
1406 | cropcap->bounds.top = 0; | ||
1407 | cropcap->bounds.left = 0; | ||
1408 | cropcap->bounds.width = 720; | ||
1409 | cropcap->bounds.height = dev->tvnorm == V4L2_STD_PAL_BG ? 576 : 480; | ||
1410 | cropcap->pixelaspect.numerator = | ||
1411 | dev->tvnorm == V4L2_STD_PAL_BG ? 59 : 10; | ||
1412 | cropcap->pixelaspect.denominator = | ||
1413 | dev->tvnorm == V4L2_STD_PAL_BG ? 54 : 11; | ||
1414 | cropcap->defrect = cropcap->bounds; | ||
1415 | return 0; | ||
1416 | } | ||
1417 | |||
1418 | static int cx25821_vidioc_s_crop(struct file *file, void *priv, const struct v4l2_crop *crop) | ||
1419 | { | ||
1420 | struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; | ||
1421 | struct cx25821_fh *fh = priv; | ||
1422 | int err; | ||
1423 | |||
1424 | if (fh) { | ||
1425 | err = v4l2_prio_check(&dev->channels[fh->channel_id].prio, | ||
1426 | fh->prio); | ||
1427 | if (0 != err) | ||
1428 | return err; | ||
1429 | } | ||
1430 | /* cx25821_vidioc_s_crop not supported */ | ||
1431 | return -EINVAL; | ||
1432 | } | ||
1433 | |||
1434 | static int cx25821_vidioc_g_crop(struct file *file, void *priv, struct v4l2_crop *crop) | ||
1435 | { | ||
1436 | /* cx25821_vidioc_g_crop not supported */ | ||
1437 | return -EINVAL; | ||
1438 | } | ||
1439 | |||
1440 | static long video_ioctl_upstream9(struct file *file, unsigned int cmd, | 1399 | static long video_ioctl_upstream9(struct file *file, unsigned int cmd, |
1441 | unsigned long arg) | 1400 | unsigned long arg) |
1442 | { | 1401 | { |
@@ -1713,9 +1672,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { | |||
1713 | .vidioc_dqbuf = vidioc_dqbuf, | 1672 | .vidioc_dqbuf = vidioc_dqbuf, |
1714 | .vidioc_g_std = cx25821_vidioc_g_std, | 1673 | .vidioc_g_std = cx25821_vidioc_g_std, |
1715 | .vidioc_s_std = cx25821_vidioc_s_std, | 1674 | .vidioc_s_std = cx25821_vidioc_s_std, |
1716 | .vidioc_cropcap = cx25821_vidioc_cropcap, | ||
1717 | .vidioc_s_crop = cx25821_vidioc_s_crop, | ||
1718 | .vidioc_g_crop = cx25821_vidioc_g_crop, | ||
1719 | .vidioc_enum_input = cx25821_vidioc_enum_input, | 1675 | .vidioc_enum_input = cx25821_vidioc_enum_input, |
1720 | .vidioc_g_input = cx25821_vidioc_g_input, | 1676 | .vidioc_g_input = cx25821_vidioc_g_input, |
1721 | .vidioc_s_input = cx25821_vidioc_s_input, | 1677 | .vidioc_s_input = cx25821_vidioc_s_input, |