Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: media/common/saa7146: rename VFL_TYPE_GRABBER to _VIDEO

'GRABBER' is a weird name, all other types map to the /dev
device names. Rename to 'VIDEO' to be consistent with the
other types.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
a9112683 7fbbbc78

+5 -5
+5 -5
drivers/media/common/saa7146/saa7146_fops.c
··· 294 294 int res; 295 295 296 296 switch (vdev->vfl_type) { 297 - case VFL_TYPE_GRABBER: { 297 + case VFL_TYPE_VIDEO: { 298 298 DEB_EE("V4L2_BUF_TYPE_VIDEO_CAPTURE: file:%p, vma:%p\n", 299 299 file, vma); 300 300 q = &fh->video_q; ··· 376 376 int ret; 377 377 378 378 switch (vdev->vfl_type) { 379 - case VFL_TYPE_GRABBER: 379 + case VFL_TYPE_VIDEO: 380 380 /* 381 381 DEB_EE("V4L2_BUF_TYPE_VIDEO_CAPTURE: file:%p, data:%p, count:%lun", 382 382 file, data, (unsigned long)count); ··· 407 407 int ret; 408 408 409 409 switch (vdev->vfl_type) { 410 - case VFL_TYPE_GRABBER: 410 + case VFL_TYPE_VIDEO: 411 411 return -EINVAL; 412 412 case VFL_TYPE_VBI: 413 413 if (fh->dev->ext_vv_data->vbi_fops.write) { ··· 595 595 DEB_EE("dev:%p, name:'%s', type:%d\n", dev, name, type); 596 596 597 597 vfd->fops = &video_fops; 598 - if (type == VFL_TYPE_GRABBER) 598 + if (type == VFL_TYPE_VIDEO) 599 599 vfd->ioctl_ops = &dev->ext_vv_data->vid_ops; 600 600 else 601 601 vfd->ioctl_ops = &dev->ext_vv_data->vbi_ops; ··· 609 609 vfd->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OVERLAY | 610 610 V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; 611 611 vfd->device_caps |= dev->ext_vv_data->capabilities; 612 - if (type == VFL_TYPE_GRABBER) 612 + if (type == VFL_TYPE_VIDEO) 613 613 vfd->device_caps &= 614 614 ~(V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_OUTPUT); 615 615 else