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

diff --git a/drivers/staging/media/allegro-dvt/allegro-core.c b/drivers/staging/media/allegro-dvt/allegro-core.c
index 0c74284..ef53730 100644 (file)
--- a/drivers/staging/media/allegro-dvt/allegro-core.c
+++ b/drivers/staging/media/allegro-dvt/allegro-core.c
@@ -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)

diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
index ca8b133..0b1200f 100644 (file)
--- a/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@ -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;

diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c
index 7712e7b..fca8f38 100644 (file)
--- a/drivers/staging/media/imx/imx-media-capture.c
+++ b/drivers/staging/media/imx/imx-media-capture.c
@@ -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;

diff --git a/drivers/staging/media/imx/imx-media-csc-scaler.c b/drivers/staging/media/imx/imx-media-csc-scaler.c
index 2b635eb..2cc77f6 100644 (file)
--- a/drivers/staging/media/imx/imx-media-csc-scaler.c
+++ b/drivers/staging/media/imx/imx-media-csc-scaler.c
@@ -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;

diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
index 569e27b..09c8ede 100644 (file)
--- a/drivers/staging/media/ipu3/ipu3-v4l2.c
+++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
@@ -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);

diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c
index 5c5dabe..7a9cc13 100644 (file)
--- a/drivers/staging/media/meson/vdec/vdec.c
+++ b/drivers/staging/media/meson/vdec/vdec.c
@@ -1076,7 +1076,7 @@ static int vdec_probe(struct platform_device *pdev)
 
        video_set_drvdata(vdev, core);
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret) {
                dev_err(dev, "Failed registering video device\n");
                goto err_vdev_release;

diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 673aa3a..bf7e999 100644 (file)
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -1242,7 +1242,7 @@ int omap4iss_video_init(struct iss_video *video, const char *name)
        video->video.fops = &iss_video_fops;
        snprintf(video->video.name, sizeof(video->video.name),
                 "OMAP4 ISS %s %s", name, direction);
-       video->video.vfl_type = VFL_TYPE_GRABBER;
+       video->video.vfl_type = VFL_TYPE_VIDEO;
        video->video.release = video_device_release_empty;
        video->video.ioctl_ops = &iss_video_ioctl_ops;
        video->pipe.stream_state = ISS_PIPELINE_STREAM_STOPPED;
@@ -1270,7 +1270,7 @@ int omap4iss_video_register(struct iss_video *video, struct v4l2_device *vdev)
                video->video.device_caps = V4L2_CAP_VIDEO_OUTPUT;
        video->video.device_caps |= V4L2_CAP_STREAMING;
 
-       ret = video_register_device(&video->video, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(&video->video, VFL_TYPE_VIDEO, -1);
        if (ret < 0)
                dev_err(video->iss->dev,
                        "could not register video device (%d)\n", ret);

diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
index 524e0dd..7cc2ace 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -1362,7 +1362,7 @@ static int rkisp1_register_capture(struct rkisp1_capture *cap)
 
        vdev->queue = q;
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret) {
                dev_err(cap->rkisp1->dev,
                        "failed to register %s, ret=%d\n", vdev->name, ret);

diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c
index 781f0ca..44d542c 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-params.c
+++ b/drivers/staging/media/rkisp1/rkisp1-params.c
@@ -1605,7 +1605,7 @@ int rkisp1_params_register(struct rkisp1_params *params,
        ret = media_entity_pads_init(&vdev->entity, 1, &node->pad);
        if (ret)
                goto err_release_queue;
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret) {
                dev_err(&vdev->dev,
                        "failed to register %s, ret=%d\n", vdev->name, ret);

diff --git a/drivers/staging/media/rkisp1/rkisp1-stats.c b/drivers/staging/media/rkisp1/rkisp1-stats.c
index d98ea15..c0ccc86 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-stats.c
+++ b/drivers/staging/media/rkisp1/rkisp1-stats.c
@@ -487,7 +487,7 @@ int rkisp1_stats_register(struct rkisp1_stats *stats,
        if (ret)
                goto err_release_queue;
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret) {
                dev_err(&vdev->dev,
                        "failed to register %s, ret=%d\n", vdev->name, ret);

diff --git a/drivers/staging/media/soc_camera/soc_camera.c b/drivers/staging/media/soc_camera/soc_camera.c
index 7b9448e..39f513f 100644 (file)
--- a/drivers/staging/media/soc_camera/soc_camera.c
+++ b/drivers/staging/media/soc_camera/soc_camera.c
@@ -2068,7 +2068,7 @@ static int soc_camera_video_start(struct soc_camera_device *icd)
                v4l2_disable_ioctl(icd->vdev, VIDIOC_S_STD);
                v4l2_disable_ioctl(icd->vdev, VIDIOC_ENUMSTD);
        }
-       ret = video_register_device(icd->vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(icd->vdev, VFL_TYPE_VIDEO, -1);
        if (ret < 0) {
                dev_err(icd->pdev, "video_register_device failed: %d\n", ret);
                return ret;

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
index c6ddd46..05a8551 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -414,7 +414,7 @@ static int cedrus_probe(struct platform_device *pdev)
        dev->mdev.ops = &cedrus_m2m_media_ops;
        dev->v4l2_dev.mdev = &dev->mdev;
 
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
+       ret = video_register_device(vfd, VFL_TYPE_VIDEO, 0);
        if (ret) {
                v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
                goto err_m2m;