diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-12-24 08:33:19 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:17:07 -0500 |
commit | 08af245de0cf6ab5f4ed008ee2bb99273774fce0 (patch) | |
tree | d07a9b38eb4b9442ef0e935063a5f7f40248e19e /drivers/media/video/cpia2/cpia2_v4l.c | |
parent | b69a219e0e97441dbeb0262cf85468b61a161399 (diff) |
[media] V4L: remove V4L1 compatibility mode
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cpia2/cpia2_v4l.c')
-rw-r--r-- | drivers/media/video/cpia2/cpia2_v4l.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index 46b433bbf2c1..7edf80b0d01a 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c | |||
@@ -419,28 +419,6 @@ static int sync(struct camera_data *cam, int frame_nr) | |||
419 | 419 | ||
420 | /****************************************************************************** | 420 | /****************************************************************************** |
421 | * | 421 | * |
422 | * ioctl_get_mbuf | ||
423 | * | ||
424 | *****************************************************************************/ | ||
425 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
426 | static int ioctl_get_mbuf(void *arg, struct camera_data *cam) | ||
427 | { | ||
428 | struct video_mbuf *vm; | ||
429 | int i; | ||
430 | vm = arg; | ||
431 | |||
432 | memset(vm, 0, sizeof(*vm)); | ||
433 | vm->size = cam->frame_size*cam->num_frames; | ||
434 | vm->frames = cam->num_frames; | ||
435 | for (i = 0; i < cam->num_frames; i++) | ||
436 | vm->offsets[i] = cam->frame_size * i; | ||
437 | |||
438 | return 0; | ||
439 | } | ||
440 | #endif | ||
441 | |||
442 | /****************************************************************************** | ||
443 | * | ||
444 | * ioctl_set_gpio | 422 | * ioctl_set_gpio |
445 | * | 423 | * |
446 | *****************************************************************************/ | 424 | *****************************************************************************/ |
@@ -1380,17 +1358,6 @@ static long cpia2_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
1380 | } | 1358 | } |
1381 | break; | 1359 | break; |
1382 | } | 1360 | } |
1383 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
1384 | case VIDIOCGMBUF: | ||
1385 | { | ||
1386 | struct cpia2_fh *fh = file->private_data; | ||
1387 | if(fh->prio != V4L2_PRIORITY_RECORD) { | ||
1388 | mutex_unlock(&cam->busy_lock); | ||
1389 | return -EBUSY; | ||
1390 | } | ||
1391 | break; | ||
1392 | } | ||
1393 | #endif | ||
1394 | default: | 1361 | default: |
1395 | break; | 1362 | break; |
1396 | } | 1363 | } |
@@ -1400,11 +1367,6 @@ static long cpia2_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
1400 | case CPIA2_IOC_SET_GPIO: | 1367 | case CPIA2_IOC_SET_GPIO: |
1401 | retval = ioctl_set_gpio(arg, cam); | 1368 | retval = ioctl_set_gpio(arg, cam); |
1402 | break; | 1369 | break; |
1403 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
1404 | case VIDIOCGMBUF: /* mmap interface */ | ||
1405 | retval = ioctl_get_mbuf(arg, cam); | ||
1406 | break; | ||
1407 | #endif | ||
1408 | case VIDIOC_QUERYCAP: | 1370 | case VIDIOC_QUERYCAP: |
1409 | retval = ioctl_querycap(arg,cam); | 1371 | retval = ioctl_querycap(arg,cam); |
1410 | break; | 1372 | break; |