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

diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c
index 09104304bd06be9cbb92ec8ab008bcbcf6a58e5f..e3f302bc2f9644140e41e4ebb18878b6a855eb66 100644 (file)
--- a/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/am437x/am437x-vpfe.c
@@ -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");

diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
index ef9c092984613bcef4596ba511e830b17febe953..47444a336ebbbd6dd46a8776cb27eee8611745b0 100644 (file)
--- a/drivers/media/platform/aspeed-video.c
+++ b/drivers/media/platform/aspeed-video.c
@@ -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);

diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
index b6c9a78c919873c79d37de21911f9164ba32bc15..a6e9797a0ec990e3a64ced0517b3a4cfb98da700 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc-base.c
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
@@ -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);

diff --git a/drivers/media/platform/atmel/atmel-isi.c b/drivers/media/platform/atmel/atmel-isi.c
index 963dfd6e750eed44eae88842f488a41d4420cb84..d74aa73f26bea9be1f281a3a5d5bca6e4fbc0ab2 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isi.c
+++ b/drivers/media/platform/atmel/atmel-isi.c
@@ -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;

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index acff10ad257a9707a9ed93b7c2d1c1cda678a847..d0d093dd8f7cf02ca42b7ed39bdb76b035769ce1 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -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",

diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index ae419958e4204d2749f090c4140ed2a265bb0e95..38d3088d4d38d77e71fcc1e0b349259d83d2600b 100644 (file)
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -1339,7 +1339,7 @@ static int register_device(struct vpbe_layer *vpbe_display_layer,
 
        vpbe_display_layer->video_dev.queue = &vpbe_display_layer->buffer_queue;
        err = video_register_device(&vpbe_display_layer->video_dev,
-                                   VFL_TYPE_GRABBER,
+                                   VFL_TYPE_VIDEO,
                                    -1);
        if (err)
                return -ENODEV;

diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index 9b1d9643589bef6e86b0b8f40090e0cf2c264a61..5606da559bdf9c2a31f4373d58c13143fa6f0d11 100644 (file)
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -1780,7 +1780,7 @@ static int vpfe_probe(struct platform_device *pdev)
                "video_dev=%p\n", &vpfe_dev->video_dev);
        vpfe_dev->fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
        ret = video_register_device(&vpfe_dev->video_dev,
-                                   VFL_TYPE_GRABBER, -1);
+                                   VFL_TYPE_VIDEO, -1);
 
        if (ret) {
                v4l2_err(pdev->dev.driver,

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 71f4fe882d138f4f69abd16309a221c8490f7de7..d9ec439faefa64577b7c21bd27176ff993906a70 100644 (file)
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1466,7 +1466,7 @@ static int vpif_probe_complete(void)
                vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
                video_set_drvdata(&ch->video_dev, ch);
                err = video_register_device(vdev,
-                                           VFL_TYPE_GRABBER, (j ? 1 : 0));
+                                           VFL_TYPE_VIDEO, (j ? 1 : 0));
                if (err)
                        goto probe_out;
        }

diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index abbdbac08e6f4664feedd7f6144ffcab72d4c046..ead14c49d4f5b0ca888364770154dac3bfe862da 100644 (file)
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -1214,7 +1214,7 @@ static int vpif_probe_complete(void)
                vdev->lock = &common->lock;
                vdev->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
                video_set_drvdata(&ch->video_dev, ch);
-               err = video_register_device(vdev, VFL_TYPE_GRABBER,
+               err = video_register_device(vdev, VFL_TYPE_VIDEO,
                                            (j ? 3 : 2));
                if (err < 0)
                        goto probe_out;

diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
index 35a1d0d6dd6607d844918e75e70cbe93078dbb93..e2c162635f7278826052dd684d41e3236471d688 100644 (file)
--- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
+++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
@@ -771,7 +771,7 @@ int gsc_register_m2m_device(struct gsc_dev *gsc)
                return PTR_ERR(gsc->m2m.m2m_dev);
        }
 
-       ret = video_register_device(&gsc->vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(&gsc->vdev, VFL_TYPE_VIDEO, -1);
        if (ret) {
                dev_err(&pdev->dev,
                         "%s(): failed to register video device\n", __func__);

diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
index 121d609ff85686035c2c81905bc43d7196ed24b5..705f182330ca4637cb383bc7b9ff618f8776c4a7 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-capture.c
+++ b/drivers/media/platform/exynos4-is/fimc-capture.c
@@ -1808,7 +1808,7 @@ static int fimc_register_capture_device(struct fimc_dev *fimc,
        if (ret)
                goto err_me_cleanup;
 
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
        if (ret)
                goto err_ctrl_free;
 

diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c
index d2cbcdca0463db6a9ce8f8549a4436005782d51d..15f443fa7208226f34c10cdc74723aa21ed372c6 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
+++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
@@ -619,7 +619,7 @@ int fimc_isp_video_device_register(struct fimc_isp *isp,
 
        video_set_drvdata(vdev, isp);
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret < 0) {
                media_entity_cleanup(&vdev->entity);
                return ret;

diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
index 17de14fbba3173d3fdf93683bcec82268546271e..394e0818f2d5c894fa07f387fa196c39f2da936f 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -1297,7 +1297,7 @@ static int fimc_lite_subdev_registered(struct v4l2_subdev *sd)
        video_set_drvdata(vfd, fimc);
        fimc->ve.pipe = v4l2_get_subdev_hostdata(sd);
 
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
        if (ret < 0) {
                media_entity_cleanup(&vfd->entity);
                fimc->ve.pipe = NULL;

diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/exynos4-is/fimc-m2m.c
index c70c2cbe3eb1b38b5920584d273ae1fe1da72b0e..4acb179556c4126f687143acd2b1679b3f17254d 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-m2m.c
+++ b/drivers/media/platform/exynos4-is/fimc-m2m.c
@@ -746,7 +746,7 @@ int fimc_register_m2m_device(struct fimc_dev *fimc,
        if (ret)
                goto err_me;
 
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
        if (ret)
                goto err_vd;
 

diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index 81a8faedbba6cba3e3bd353ac4e97648d695ea06..84633a3b847578065c74bef163e194296d7694a5 100644 (file)
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -1486,7 +1486,7 @@ static int viu_of_probe(struct platform_device *op)
 
        mutex_lock(&viu_dev->lock);
 
-       ret = video_register_device(viu_dev->vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(viu_dev->vdev, VFL_TYPE_VIDEO, -1);
        if (ret < 0) {
                video_device_release(viu_dev->vdev);
                goto err_unlock;

diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/imx-pxp.c
index 38d9423223025382d0e529dc82cc3229a8597765..08d76eb05ed1a446d9827c13aa4a20d999fbb353 100644 (file)
--- a/drivers/media/platform/imx-pxp.c
+++ b/drivers/media/platform/imx-pxp.c
@@ -1709,7 +1709,7 @@ static int pxp_probe(struct platform_device *pdev)
                goto err_v4l2;
        }
 
-       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;

diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c
index 9ad24c86c5abc10f753cd5c0a61187908d53fd3f..1f89e71cdccfc7685ad556a7c631c8418fe2aa6f 100644 (file)
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -953,7 +953,7 @@ static int deinterlace_probe(struct platform_device *pdev)
        vfd->lock = &pcdev->dev_mutex;
        vfd->v4l2_dev = &pcdev->v4l2_dev;
 
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
+       ret = video_register_device(vfd, VFL_TYPE_VIDEO, 0);
        if (ret) {
                v4l2_err(&pcdev->v4l2_dev, "Failed to register video device\n");
                goto unreg_dev;

diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index 803baf97f06e4a4806831fb12f11de0668762e69..09775b6624c6b765a7f015e2d91883d8321ab35a 100644 (file)
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -1802,7 +1802,7 @@ static int mccic_notify_bound(struct v4l2_async_notifier *notifier,
        cam->vdev.lock = &cam->s_mutex;
        cam->vdev.queue = &cam->vb_queue;
        video_set_drvdata(&cam->vdev, cam);
-       ret = video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(&cam->vdev, VFL_TYPE_VIDEO, -1);
        if (ret) {
                cam->sensor = NULL;
                goto out;

diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
index ee802fc3bcdfc8f365453ff4da5df616155f50ff..f82a81a3bdee2f1ae6d312278ecb8f901d272bc1 100644 (file)
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -1150,7 +1150,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
        jpeg->dec_vdev->device_caps = V4L2_CAP_STREAMING |
                                      V4L2_CAP_VIDEO_M2M_MPLANE;
 
-       ret = video_register_device(jpeg->dec_vdev, VFL_TYPE_GRABBER, 3);
+       ret = video_register_device(jpeg->dec_vdev, VFL_TYPE_VIDEO, 3);
        if (ret) {
                v4l2_err(&jpeg->v4l2_dev, "Failed to register video device\n");
                goto err_dec_vdev_register;

diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
index 7c9e2d69e21a0d7010030ea13a3efaf2d057f050..821f2cf325f0d267c55e90acdb58359437443101 100644 (file)
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
@@ -1229,7 +1229,7 @@ int mtk_mdp_register_m2m_device(struct mtk_mdp_dev *mdp)
                goto err_m2m_init;
        }
 
-       ret = video_register_device(mdp->vdev, VFL_TYPE_GRABBER, 2);
+       ret = video_register_device(mdp->vdev, VFL_TYPE_VIDEO, 2);
        if (ret) {
                dev_err(dev, "failed to register video device\n");
                goto err_vdev_register;

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
index 100ae8c5e702869c7fab2e0b20b9f5a1fa35a184..97a1b6664c209db2eec488797d50b64628c64ddd 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
@@ -331,7 +331,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
                goto err_event_workq;
        }
 
-       ret = video_register_device(vfd_dec, VFL_TYPE_GRABBER, 0);
+       ret = video_register_device(vfd_dec, VFL_TYPE_VIDEO, 0);
        if (ret) {
                mtk_v4l2_err("Failed to register video device");
                goto err_dec_reg;

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
index 1d82aa2b6017c00ea5168fdf2972fd8d686cced4..4d31f1ed113f7a55dc4799ce86911e2d8a3f81d1 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
@@ -356,7 +356,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
                goto err_event_workq;
        }
 
-       ret = video_register_device(vfd_enc, VFL_TYPE_GRABBER, 1);
+       ret = video_register_device(vfd_enc, VFL_TYPE_VIDEO, 1);
        if (ret) {
                mtk_v4l2_err("Failed to register video device");
                goto err_enc_reg;

diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c
index 27779b75df543752d1fb2faa24d80a93050d6aa6..df78df59da456b4bb849154932a1b83456d6760a 100644 (file)
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -866,7 +866,7 @@ static int emmaprp_probe(struct platform_device *pdev)
                goto rel_vdev;
        }
 
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
+       ret = video_register_device(vfd, VFL_TYPE_VIDEO, 0);
        if (ret) {
                v4l2_err(&pcdev->v4l2_dev, "Failed to register video device\n");
                goto rel_m2m;

diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index 513b99bf963b2bba75754994998aa59e164306a8..21193f0b7f616e4c635d4316b63f9f3b67169237 100644 (file)
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -1500,7 +1500,7 @@ static int __init omap_vout_create_video_devices(struct platform_device *pdev)
                /* Register the Video device with V4L2
                 */
                vfd = vout->vfd;
-               if (video_register_device(vfd, VFL_TYPE_GRABBER, -1) < 0) {
+               if (video_register_device(vfd, VFL_TYPE_VIDEO, -1) < 0) {
                        dev_err(&pdev->dev,
                                ": Could not register Video for Linux device\n");
                        vfd->minor = -1;

diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index ee183c35ff3b70fced97ee5bd901ffdbd931aec5..0ed250ffd95b93b9b05c3cbcdeef36c75587a76d 100644 (file)
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -1453,7 +1453,7 @@ int omap3isp_video_init(struct isp_video *video, const char *name)
        video->video.fops = &isp_video_fops;
        snprintf(video->video.name, sizeof(video->video.name),
                 "OMAP3 ISP %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 = &isp_video_ioctl_ops;
        if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -1484,7 +1484,7 @@ int omap3isp_video_register(struct isp_video *video, struct v4l2_device *vdev)
 
        video->video.v4l2_dev = vdev;
 
-       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->isp->dev,
                        "%s: could not register video device (%d)\n",

diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c
index 321dee9ca81cb01dd15e862fd5d7982fc8c4ca01..70c85a2a10f51a9e30a875e4ec120cd22b33a3f5 100644 (file)
--- a/drivers/media/platform/pxa_camera.c
+++ b/drivers/media/platform/pxa_camera.c
@@ -2191,7 +2191,7 @@ static int pxa_camera_sensor_bound(struct v4l2_async_notifier *notifier,
        if (err)
                goto out_sensor_poweroff;
 
-       err = video_register_device(&pcdev->vdev, VFL_TYPE_GRABBER, -1);
+       err = video_register_device(&pcdev->vdev, VFL_TYPE_VIDEO, -1);
        if (err) {
                v4l2_err(v4l2_dev, "register video device failed: %d\n", err);
                pcdev->sensor = NULL;

diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
index 1d50dfbbb762e585d0cf5d9f164f6f782fa61624..c4220778ad472aea84dd7f4eed0f0c56bb151997 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-video.c
+++ b/drivers/media/platform/qcom/camss/camss-video.c
@@ -921,7 +921,7 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
        vdev->lock = &video->lock;
        strscpy(vdev->name, name, sizeof(vdev->name));
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret < 0) {
                dev_err(v4l2_dev->dev, "Failed to register video device: %d\n",
                        ret);

diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index 8feaf5daece921d78a1ef882965463b92eebc103..32f0abd4f2fef247cfb583f0ae1b73d711832957 100644 (file)
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -1458,7 +1458,7 @@ static int vdec_probe(struct platform_device *pdev)
        vdev->v4l2_dev = &core->v4l2_dev;
        vdev->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret)
                goto err_vdev_release;
 

diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 453edf966d4fc051d53bb8996814c7f990f0f2cd..adaa2237fd8f17b2084c6c60064dd7a3673ba3e9 100644 (file)
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -1281,7 +1281,7 @@ static int venc_probe(struct platform_device *pdev)
        vdev->v4l2_dev = &core->v4l2_dev;
        vdev->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret)
                goto err_vdev_release;
 

diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index d1b81881c3fa5ef9c7d2ab156d01fe1d43c66209..b12b3f88836a37c7f2e4fdb196f2b91b7ec8195a 100644 (file)
--- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
+++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
@@ -969,7 +969,7 @@ int rvin_v4l2_register(struct rvin_dev *vin)
 
        rvin_format_align(vin, &vin->format);
 
-       ret = video_register_device(&vin->vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(&vin->vdev, VFL_TYPE_VIDEO, -1);
        if (ret) {
                vin_err(vin, "Failed to register video device\n");
                return ret;

diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c
index 97bed45360f088d0b513233af2db2f67a7b522b3..c9448de885b6229e542352458a9d5fa2c73a8332 100644 (file)
--- a/drivers/media/platform/rcar_fdp1.c
+++ b/drivers/media/platform/rcar_fdp1.c
@@ -2344,7 +2344,7 @@ static int fdp1_probe(struct platform_device *pdev)
        video_set_drvdata(vfd, fdp1);
        strscpy(vfd->name, fdp1_videodev.name, sizeof(vfd->name));
 
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
+       ret = video_register_device(vfd, VFL_TYPE_VIDEO, 0);
        if (ret) {
                v4l2_err(&fdp1->v4l2_dev, "Failed to register video device\n");
                goto release_m2m;

diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c
index 1c3f507acfc99235c42cc7e8cd9f4c21f82c32e7..5250a14324e917ce645a1122f0c0779aa8d98cc1 100644 (file)
--- a/drivers/media/platform/rcar_jpu.c
+++ b/drivers/media/platform/rcar_jpu.c
@@ -1663,7 +1663,7 @@ static int jpu_probe(struct platform_device *pdev)
        jpu->vfd_encoder.device_caps    = V4L2_CAP_STREAMING |
                                          V4L2_CAP_VIDEO_M2M_MPLANE;
 
-       ret = video_register_device(&jpu->vfd_encoder, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(&jpu->vfd_encoder, VFL_TYPE_VIDEO, -1);
        if (ret) {
                v4l2_err(&jpu->v4l2_dev, "Failed to register video device\n");
                goto m2m_init_rollback;
@@ -1682,7 +1682,7 @@ static int jpu_probe(struct platform_device *pdev)
        jpu->vfd_decoder.device_caps    = V4L2_CAP_STREAMING |
                                          V4L2_CAP_VIDEO_M2M_MPLANE;
 
-       ret = video_register_device(&jpu->vfd_decoder, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(&jpu->vfd_decoder, VFL_TYPE_VIDEO, -1);
        if (ret) {
                v4l2_err(&jpu->v4l2_dev, "Failed to register video device\n");
                goto enc_vdev_register_rollback;

diff --git a/drivers/media/platform/renesas-ceu.c b/drivers/media/platform/renesas-ceu.c
index 197b3991330d588118d4ef2f6012732d043468d7..f7d71a6a7970093b180fe483d1f775afe5f2a85b 100644 (file)
--- a/drivers/media/platform/renesas-ceu.c
+++ b/drivers/media/platform/renesas-ceu.c
@@ -1450,7 +1450,7 @@ static int ceu_notify_complete(struct v4l2_async_notifier *notifier)
                                  V4L2_CAP_STREAMING;
        video_set_drvdata(vdev, ceudev);
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret < 0) {
                v4l2_err(vdev->v4l2_dev,
                         "video_register_device failed: %d\n", ret);

diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index e9ff12b6b5bb5ebe68e712cb241caa1b0f556dad..9d122429706e9cf41a145428dac45abd2819635c 100644 (file)
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -889,7 +889,7 @@ static int rga_probe(struct platform_device *pdev)
        def_frame.stride = (def_frame.width * def_frame.fmt->depth) >> 3;
        def_frame.size = def_frame.stride * def_frame.height;
 
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
        if (ret) {
                v4l2_err(&rga->v4l2_dev, "Failed to register video device\n");
                goto rel_vdev;

diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
index 2fb45db8e4ba4736ea0750c7ec0c1d38185cce0e..9ca49af29542df899ae7a75b804e35eee31b5ad2 100644 (file)
--- a/drivers/media/platform/s3c-camif/camif-capture.c
+++ b/drivers/media/platform/s3c-camif/camif-capture.c
@@ -1158,7 +1158,7 @@ int s3c_camif_register_video_node(struct camif_dev *camif, int idx)
        vfd->ctrl_handler = &vp->ctrl_handler;
        vfd->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_CAPTURE;
 
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
        if (ret)
                goto err_ctrlh_free;
 

diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
index f5f05ea9f5213172e387fdf02def9be199eb4597..6932fd47071b066977d1e54a76fc2db596b73988 100644 (file)
--- a/drivers/media/platform/s5p-g2d/g2d.c
+++ b/drivers/media/platform/s5p-g2d/g2d.c
@@ -695,7 +695,7 @@ static int g2d_probe(struct platform_device *pdev)
        vfd->lock = &dev->mutex;
        vfd->v4l2_dev = &dev->v4l2_dev;
        vfd->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
-       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 rel_vdev;

diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index ac2162235cefd9cbe7181ab339cde451e98c6da0..86bda3947110d0af04487c1d134a38829391aaba 100644 (file)
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -2946,7 +2946,7 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
        jpeg->vfd_encoder->vfl_dir      = VFL_DIR_M2M;
        jpeg->vfd_encoder->device_caps  = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M;
 
-       ret = video_register_device(jpeg->vfd_encoder, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(jpeg->vfd_encoder, VFL_TYPE_VIDEO, -1);
        if (ret) {
                v4l2_err(&jpeg->v4l2_dev, "Failed to register video device\n");
                video_device_release(jpeg->vfd_encoder);
@@ -2976,7 +2976,7 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
        jpeg->vfd_decoder->vfl_dir      = VFL_DIR_M2M;
        jpeg->vfd_decoder->device_caps  = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M;
 
-       ret = video_register_device(jpeg->vfd_decoder, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(jpeg->vfd_decoder, VFL_TYPE_VIDEO, -1);
        if (ret) {
                v4l2_err(&jpeg->v4l2_dev, "Failed to register video device\n");
                video_device_release(jpeg->vfd_decoder);

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index b776f83e395e001ef68ed8dc69f6b5948e06a5b3..5c2a23b953a41d8681286cbb614e24b926dc8f89 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1376,7 +1376,7 @@ static int s5p_mfc_probe(struct platform_device *pdev)
        s5p_mfc_init_regs(dev);
 
        /* Register decoder and encoder */
-       ret = video_register_device(dev->vfd_dec, VFL_TYPE_GRABBER, 0);
+       ret = video_register_device(dev->vfd_dec, VFL_TYPE_VIDEO, 0);
        if (ret) {
                v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
                goto err_dec_reg;
@@ -1384,7 +1384,7 @@ static int s5p_mfc_probe(struct platform_device *pdev)
        v4l2_info(&dev->v4l2_dev,
                  "decoder registered as /dev/video%d\n", dev->vfd_dec->num);
 
-       ret = video_register_device(dev->vfd_enc, VFL_TYPE_GRABBER, 0);
+       ret = video_register_device(dev->vfd_enc, VFL_TYPE_VIDEO, 0);
        if (ret) {
                v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
                goto err_enc_reg;

diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c
index 2b4c0d9d6928870a4ea998fd33eecd1426a3e6a1..f08b8fc192d87795e530dafcc6b2589d43ed2f85 100644 (file)
--- a/drivers/media/platform/sh_veu.c
+++ b/drivers/media/platform/sh_veu.c
@@ -1160,7 +1160,7 @@ static int sh_veu_probe(struct platform_device *pdev)
        pm_runtime_enable(&pdev->dev);
        pm_runtime_resume(&pdev->dev);
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        pm_runtime_suspend(&pdev->dev);
        if (ret < 0)
                goto evidreg;

diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index 2236702c21b43faab14f19cd73266aace37f13f7..36e5f2ff4ef1d213e8c8a16e57f36125eb7e423c 100644 (file)
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -1323,7 +1323,7 @@ static int sh_vou_probe(struct platform_device *pdev)
                goto ei2cnd;
        }
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret < 0)
                goto evregdev;
 

diff --git a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
index d1025a53709fdd56d12750f257a3b6e8fa5a2223..af2d5eb782cee1e7ab3aa8e8c7cc18886bbdb99d 100644 (file)
--- a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
+++ b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
@@ -1066,7 +1066,7 @@ static int bdisp_register_device(struct bdisp_dev *bdisp)
                return PTR_ERR(bdisp->m2m.m2m_dev);
        }
 
-       ret = video_register_device(&bdisp->vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(&bdisp->vdev, VFL_TYPE_VIDEO, -1);
        if (ret) {
                dev_err(bdisp->dev,
                        "%s(): failed to register video device\n", __func__);

diff --git a/drivers/media/platform/sti/delta/delta-v4l2.c b/drivers/media/platform/sti/delta/delta-v4l2.c
index 91369fb3ffaa41bf3bdd6822f9d8c86066c39efc..2503224eeee5103e115e9650667dab63ab01549e 100644 (file)
--- a/drivers/media/platform/sti/delta/delta-v4l2.c
+++ b/drivers/media/platform/sti/delta/delta-v4l2.c
@@ -1781,7 +1781,7 @@ static int delta_register_device(struct delta_dev *delta)
        snprintf(vdev->name, sizeof(vdev->name), "%s-%s",
                 DELTA_NAME, DELTA_FW_VERSION);
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret) {
                dev_err(delta->dev, "%s failed to register video device\n",
                        DELTA_PREFIX);

diff --git a/drivers/media/platform/sti/hva/hva-v4l2.c b/drivers/media/platform/sti/hva/hva-v4l2.c
index 64004d15a9c964d88e670daeadafdb35660cbfa1..197b99d8fd9cf61623d539c81f48fbf1f5a72dcb 100644 (file)
--- a/drivers/media/platform/sti/hva/hva-v4l2.c
+++ b/drivers/media/platform/sti/hva/hva-v4l2.c
@@ -1316,7 +1316,7 @@ static int hva_register_device(struct hva_dev *hva)
        snprintf(vdev->name, sizeof(vdev->name), "%s%lx", HVA_NAME,
                 hva->ip_version);
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret) {
                dev_err(dev, "%s failed to register video device\n",
                        HVA_PREFIX);

diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c
index b63ff8d636ceab11f8ee9d3b044763af7043cef3..b8931490b83b73be64ccda04c4ea808396ab422e 100644 (file)
--- a/drivers/media/platform/stm32/stm32-dcmi.c
+++ b/drivers/media/platform/stm32/stm32-dcmi.c
@@ -1974,7 +1974,7 @@ static int dcmi_probe(struct platform_device *pdev)
        }
        dcmi->vdev->entity.flags |= MEDIA_ENT_FL_DEFAULT;
 
-       ret = video_register_device(dcmi->vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(dcmi->vdev, VFL_TYPE_VIDEO, -1);
        if (ret) {
                dev_err(dcmi->dev, "Failed to register video device\n");
                goto err_media_entity_cleanup;

diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
index 83a3a0257c7b512382a86ad4abc2aae8c5f72386..5aee3fd875ada7c2b0c9cbf27efbae362754b45c 100644 (file)
--- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
+++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
@@ -374,7 +374,7 @@ int sun4i_csi_v4l2_register(struct sun4i_csi *csi)
        vdev->ioctl_ops = &sun4i_csi_ioctl_ops;
        video_set_drvdata(vdev, csi);
 
-       ret = video_register_device(&csi->vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(&csi->vdev, VFL_TYPE_VIDEO, -1);
        if (ret)
                return ret;
 

diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c
index f0dfe68486d16e45b813452ce092a2e107631784..cb30efb5d1f1d066e3a1f54c72f39f2cfa88a2bd 100644 (file)
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c
@@ -648,7 +648,7 @@ int sun6i_video_init(struct sun6i_video *video, struct sun6i_csi *csi,
        vdev->release           = video_device_release_empty;
        vdev->fops              = &sun6i_video_fops;
        vdev->ioctl_ops         = &sun6i_video_ioctl_ops;
-       vdev->vfl_type          = VFL_TYPE_GRABBER;
+       vdev->vfl_type          = VFL_TYPE_VIDEO;
        vdev->vfl_dir           = VFL_DIR_RX;
        vdev->v4l2_dev          = &csi->v4l2_dev;
        vdev->queue             = vidq;
@@ -656,7 +656,7 @@ int sun6i_video_init(struct sun6i_video *video, struct sun6i_csi *csi,
        vdev->device_caps       = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_CAPTURE;
        video_set_drvdata(vdev, video);
 
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret < 0) {
                v4l2_err(&csi->v4l2_dev,
                         "video_register_device failed: %d\n", ret);

diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
index b61f3dea7c93dd212b3c39952c1a6e2bba7cd727..214567367324308b0ef35efa75c1bf24bbb55a83 100644 (file)
--- a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
+++ b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
@@ -882,7 +882,7 @@ static int deinterlace_probe(struct platform_device *pdev)
                 deinterlace_video_device.name);
        video_set_drvdata(vfd, dev);
 
-       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");
 

diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index be54806180a5a377f70c769fb92a329d0af2a44d..6e009e479be38f8c636766a08c41f53d5385904b 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -1948,7 +1948,7 @@ static int cal_complete_ctx(struct cal_ctx *ctx)
        vfd->lock = &ctx->mutex;
        video_set_drvdata(vfd, ctx);
 
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, video_nr);
+       ret = video_register_device(vfd, VFL_TYPE_VIDEO, video_nr);
        if (ret < 0)
                return ret;
 

diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c
index 65c2c048b018c63a86eca8e04dd30c4229fd0350..cff2fcd6d812a49ca125cf5a749100bec3fabae8 100644 (file)
--- a/drivers/media/platform/ti-vpe/vpe.c
+++ b/drivers/media/platform/ti-vpe/vpe.c
@@ -2500,7 +2500,7 @@ static void vpe_fw_cb(struct platform_device *pdev)
        vfd->lock = &dev->dev_mutex;
        vfd->v4l2_dev = &dev->v4l2_dev;
 
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
+       ret = video_register_device(vfd, VFL_TYPE_VIDEO, 0);
        if (ret) {
                vpe_err(dev, "Failed to register video device\n");
 

diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c
index 78841b9015ce5ed1c9021ce24930b0559fdb5b55..c88fd3403edaf90ff6b9ef2686900abcb413f951 100644 (file)
--- a/drivers/media/platform/via-camera.c
+++ b/drivers/media/platform/via-camera.c
@@ -1262,7 +1262,7 @@ static int viacam_probe(struct platform_device *pdev)
        cam->vdev.lock = &cam->lock;
        cam->vdev.queue = vq;
        video_set_drvdata(&cam->vdev, cam);
-       ret = video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(&cam->vdev, VFL_TYPE_VIDEO, -1);
        if (ret)
                goto out_irq;
 

diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
index 82350097503e68185cada9f8e673aa781680a22a..f78579b4876253649aed2e08fe93c4367464faf3 100644 (file)
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@ -2120,7 +2120,7 @@ static int register_instance(struct vicodec_dev *dev,
        }
        video_set_drvdata(vfd, dev);
 
-       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 '%s'\n", name);
                v4l2_m2m_release(dev_instance->m2m_dev);

diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c
index 8d6b09623d884d09d515c240d5cf3a81fb00fc86..ac6717fbb76493c825e3184e10caef2fc221e015 100644 (file)
--- a/drivers/media/platform/vim2m.c
+++ b/drivers/media/platform/vim2m.c
@@ -1333,7 +1333,7 @@ static int vim2m_probe(struct platform_device *pdev)
        vfd->lock = &dev->dev_mutex;
        vfd->v4l2_dev = &dev->v4l2_dev;
 
-       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 error_v4l2;

diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c
index 76c015898cfdbdc27ce359bf9993a6a2e4016004..0615aa4dc733de97d0b13a84fe94473dfc86b777 100644 (file)
--- a/drivers/media/platform/vimc/vimc-capture.c
+++ b/drivers/media/platform/vimc/vimc-capture.c
@@ -460,7 +460,7 @@ struct vimc_ent_device *vimc_cap_add(struct vimc_device *vimc,
        video_set_drvdata(vdev, &vcap->ved);
 
        /* Register the video_device with the v4l2 and the media framework */
-       ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
        if (ret) {
                dev_err(&vimc->pdev.dev, "%s: video register failed (err=%d)\n",
                        vcap->vdev.name, ret);

diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c
index 15091cbf6de704bc21a5a096a04b1073248a27a4..c62c068b6b6080d74679e582ffa43d3725c6aae9 100644 (file)
--- a/drivers/media/platform/vivid/vivid-core.c
+++ b/drivers/media/platform/vivid/vivid-core.c
@@ -407,7 +407,7 @@ static int vidioc_log_status(struct file *file, void *fh)
        struct video_device *vdev = video_devdata(file);
 
        v4l2_ctrl_log_status(file, fh);
-       if (vdev->vfl_dir == VFL_DIR_RX && vdev->vfl_type == VFL_TYPE_GRABBER)
+       if (vdev->vfl_dir == VFL_DIR_RX && vdev->vfl_type == VFL_TYPE_VIDEO)
                tpg_log_status(&dev->tpg);
        return 0;
 }
@@ -1525,7 +1525,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
                }
 #endif
 
-               ret = video_register_device(vfd, VFL_TYPE_GRABBER, vid_cap_nr[inst]);
+               ret = video_register_device(vfd, VFL_TYPE_VIDEO, vid_cap_nr[inst]);
                if (ret < 0)
                        goto unreg_dev;
                v4l2_info(&dev->v4l2_dev, "V4L2 capture device registered as %s\n",
@@ -1578,7 +1578,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
                }
 #endif
 
-               ret = video_register_device(vfd, VFL_TYPE_GRABBER, vid_out_nr[inst]);
+               ret = video_register_device(vfd, VFL_TYPE_VIDEO, vid_out_nr[inst]);
                if (ret < 0)
                        goto unreg_dev;
                v4l2_info(&dev->v4l2_dev, "V4L2 output device registered as %s\n",
@@ -1734,7 +1734,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
                if (ret)
                        goto unreg_dev;
 #endif
-               ret = video_register_device(vfd, VFL_TYPE_GRABBER,
+               ret = video_register_device(vfd, VFL_TYPE_VIDEO,
                                            meta_cap_nr[inst]);
                if (ret < 0)
                        goto unreg_dev;
@@ -1764,7 +1764,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
                if (ret)
                        goto unreg_dev;
 #endif
-               ret = video_register_device(vfd, VFL_TYPE_GRABBER,
+               ret = video_register_device(vfd, VFL_TYPE_VIDEO,
                                            meta_out_nr[inst]);
                if (ret < 0)
                        goto unreg_dev;

diff --git a/drivers/media/platform/vsp1/vsp1_histo.c b/drivers/media/platform/vsp1/vsp1_histo.c
index 30d751f2cccf1b98faec4b2042ac647bb5b84270..a91e142bcb9480ced285aa17fdef7b9e84bf5650 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_histo.c
+++ b/drivers/media/platform/vsp1/vsp1_histo.c
@@ -551,7 +551,7 @@ int vsp1_histogram_init(struct vsp1_device *vsp1, struct vsp1_histogram *histo,
        histo->video.fops = &histo_v4l2_fops;
        snprintf(histo->video.name, sizeof(histo->video.name),
                 "%s histo", histo->entity.subdev.name);
-       histo->video.vfl_type = VFL_TYPE_GRABBER;
+       histo->video.vfl_type = VFL_TYPE_VIDEO;
        histo->video.release = video_device_release_empty;
        histo->video.ioctl_ops = &histo_v4l2_ioctl_ops;
        histo->video.device_caps = V4L2_CAP_META_CAPTURE | V4L2_CAP_STREAMING;
@@ -576,7 +576,7 @@ int vsp1_histogram_init(struct vsp1_device *vsp1, struct vsp1_histogram *histo,
 
        /* ... and register the video device. */
        histo->video.queue = &histo->queue;
-       ret = video_register_device(&histo->video, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(&histo->video, VFL_TYPE_VIDEO, -1);
        if (ret < 0) {
                dev_err(vsp1->dev, "failed to register video device\n");
                goto error;

diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
index 5e59ed2c3614af03c1f573ed245d6007a72d0fd7..044eb577882074c2bd71e437ed7ab7b1bc862bf8 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c
@@ -1293,7 +1293,7 @@ struct vsp1_video *vsp1_video_create(struct vsp1_device *vsp1,
        video->video.fops = &vsp1_video_fops;
        snprintf(video->video.name, sizeof(video->video.name), "%s %s",
                 rwpf->entity.subdev.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 = &vsp1_video_ioctl_ops;
 
@@ -1316,7 +1316,7 @@ struct vsp1_video *vsp1_video_create(struct vsp1_device *vsp1,
 
        /* ... and register the video device. */
        video->video.queue = &video->queue;
-       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->vsp1->dev, "failed to register video device\n");
                goto error;

diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
index 3bb54a4db6a4127792427b568ffb507aae5326b0..2a56201cb853466c3f6c7786c89d00e102126e11 100644 (file)
--- a/drivers/media/platform/xilinx/xilinx-dma.c
+++ b/drivers/media/platform/xilinx/xilinx-dma.c
@@ -685,7 +685,7 @@ int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma,
                 xdev->dev->of_node,
                 type == V4L2_BUF_TYPE_VIDEO_CAPTURE ? "output" : "input",
                 port);
-       dma->video.vfl_type = VFL_TYPE_GRABBER;
+       dma->video.vfl_type = VFL_TYPE_VIDEO;
        dma->video.vfl_dir = type == V4L2_BUF_TYPE_VIDEO_CAPTURE
                           ? VFL_DIR_RX : VFL_DIR_TX;
        dma->video.release = video_device_release_empty;
@@ -735,7 +735,7 @@ int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma,
 
        dma->align = 1 << dma->dma->device->copy_align;
 
-       ret = video_register_device(&dma->video, VFL_TYPE_GRABBER, -1);
+       ret = video_register_device(&dma->video, VFL_TYPE_VIDEO, -1);
        if (ret < 0) {
                dev_err(dma->xdev->dev, "failed to register video device\n");
                goto error;