Commit 0e17c50f authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: staging/media: 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 fd6b556f

drivers/staging/media/allegro-dvt/allegro-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2717,7 +2717,7 @@ static int allegro_register_device(struct allegro_dev *dev) 
	video_dev->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;

	video_set_drvdata(video_dev, dev);



	return video_register_device(video_dev, VFL_TYPE_GRABBER, 0);

	return video_register_device(video_dev, VFL_TYPE_VIDEO, 0);

}



static void allegro_device_run(void *priv)

drivers/staging/media/hantro/hantro_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ static int hantro_add_func(struct hantro_dev *vpu, unsigned int funcid) 


	video_set_drvdata(vfd, vpu);



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

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

	if (ret) {

		v4l2_err(&vpu->v4l2_dev, "Failed to register video device\n");

		return ret;

drivers/staging/media/imx/imx-media-capture.c

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev) 


	vfd->v4l2_dev = v4l2_dev;



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

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

	if (ret) {

		v4l2_err(sd, "Failed to register video device\n");

		return ret;

drivers/staging/media/imx/imx-media-csc-scaler.c

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ int imx_media_csc_scaler_device_register(struct imx_media_video_dev *vdev) 


	vfd->v4l2_dev = &priv->md->v4l2_dev;



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

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

	if (ret) {

		v4l2_err(vfd->v4l2_dev, "Failed to register video device\n");

		return ret;

drivers/staging/media/ipu3/ipu3-v4l2.c

+1 −1
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe, 
	vdev->queue = &node->vbq;

	vdev->vfl_dir = node->output ? VFL_DIR_TX : VFL_DIR_RX;

	video_set_drvdata(vdev, imgu);

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

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

	if (r) {

		dev_err(dev, "failed to register video device (%d)", r);

		media_entity_cleanup(&vdev->entity);