Commit 70cad449 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: media/platform: 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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 3e30a927

drivers/media/platform/am437x/am437x-vpfe.c

+1 −1
Original line number Diff line number Diff line
@@ -2267,7 +2267,7 @@ static int vpfe_probe_complete(struct vpfe_device *vpfe) 
	vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING |

			    V4L2_CAP_READWRITE;

	video_set_drvdata(vdev, vpfe);

	err = video_register_device(&vpfe->video_dev, VFL_TYPE_GRABBER, -1);

	err = video_register_device(&vpfe->video_dev, VFL_TYPE_VIDEO, -1);

	if (err) {

		vpfe_err(vpfe,

			"Unable to register video device.\n");

drivers/media/platform/aspeed-video.c

+2 −2
Original line number Diff line number Diff line
@@ -1582,14 +1582,14 @@ static int aspeed_video_setup_video(struct aspeed_video *video) 
		V4L2_CAP_STREAMING;

	vdev->v4l2_dev = v4l2_dev;

	strscpy(vdev->name, DEVICE_NAME, sizeof(vdev->name));

	vdev->vfl_type = VFL_TYPE_GRABBER;

	vdev->vfl_type = VFL_TYPE_VIDEO;

	vdev->vfl_dir = VFL_DIR_RX;

	vdev->release = video_device_release_empty;

	vdev->ioctl_ops = &aspeed_video_ioctl_ops;

	vdev->lock = &video->video_lock;



	video_set_drvdata(vdev, video);

	rc = video_register_device(vdev, VFL_TYPE_GRABBER, 0);

	rc = video_register_device(vdev, VFL_TYPE_VIDEO, 0);

	if (rc) {

		vb2_queue_release(vbq);

		v4l2_ctrl_handler_free(&video->ctrl_handler);

drivers/media/platform/atmel/atmel-isc-base.c

+1 −1
Original line number Diff line number Diff line
@@ -2311,7 +2311,7 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier) 
	vdev->device_caps	= V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_CAPTURE;

	video_set_drvdata(vdev, isc);



	ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);

	ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);

	if (ret < 0) {

		v4l2_err(&isc->v4l2_dev,

			 "video_register_device failed: %d\n", ret);

drivers/media/platform/atmel/atmel-isi.c

+1 −1
Original line number Diff line number Diff line
@@ -1094,7 +1094,7 @@ static int isi_graph_notify_complete(struct v4l2_async_notifier *notifier) 
		return ret;

	}



	ret = video_register_device(isi->vdev, VFL_TYPE_GRABBER, -1);

	ret = video_register_device(isi->vdev, VFL_TYPE_VIDEO, -1);

	if (ret) {

		dev_err(isi->dev, "Failed to register video device\n");

		return ret;

drivers/media/platform/coda/coda-common.c

+1 −1
Original line number Diff line number Diff line
@@ -2726,7 +2726,7 @@ static int coda_register_device(struct coda_dev *dev, int i) 
	v4l2_disable_ioctl(vfd, VIDIOC_G_CROP);

	v4l2_disable_ioctl(vfd, VIDIOC_S_CROP);



	ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);

	ret = video_register_device(vfd, VFL_TYPE_VIDEO, 0);

	if (!ret)

		v4l2_info(&dev->v4l2_dev, "%s registered as %s\n",

			  type == CODA_INST_ENCODER ? "encoder" : "decoder",