media: atomisp: Properly initialize function field of media-entity links

Don't use MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN to initialize the function field
of various media-entity links.

This fixes the following warnings showing up in dmesg:

 atomisp-isp2 0000:00:03.0: Entity type for entity ATOM ISP CSI2-port0 was not initialized!
 atomisp-isp2 0000:00:03.0: Entity type for entity ATOM ISP CSI2-port1 was not initialized!
 atomisp-isp2 0000:00:03.0: Entity type for entity ATOM ISP CSI2-port2 was not initialized!
 atomisp-isp2 0000:00:03.0: Entity type for entity tpg_subdev was not initialized!
 atomisp-isp2 0000:00:03.0: Entity type for entity ATOMISP_SUBDEV_0 was not initialized!
 atomisp-isp2 0000:00:03.0: Entity type for entity ATOMISP_SUBDEV_1 was not initialized!

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_csi2.c b/drivers/staging/media/atomisp/pci/atomisp_csi2.c
index 7853a23b9f531d1aa10afd1d50fa519ddb48afde..b00bc0b7aaad731e9d232167e7277756c87b1abf 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_csi2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_csi2.c
@@ -203,7 +203,7 @@ static int mipi_csi2_init_entities(struct atomisp_mipi_csi2_device *csi2,
        pads[CSI2_PAD_SINK].flags = MEDIA_PAD_FL_SINK;
 
        me->ops = &csi2_media_ops;
-       me->function = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN;
+       me->function = MEDIA_ENT_F_VID_IF_BRIDGE;
        ret = media_entity_pads_init(me, CSI2_PADS_NUM, pads);
        if (ret < 0)
                return ret;

diff --git a/drivers/staging/media/atomisp/pci/atomisp_subdev.c b/drivers/staging/media/atomisp/pci/atomisp_subdev.c
index 52d1936b8c878933b951055b88af2652f29644f5..9cfb85c61db6480773763d8d234a652f17b2bc53 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_subdev.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_subdev.c
@@ -1017,7 +1017,7 @@ static int isp_subdev_init_entities(struct atomisp_sub_device *asd)
            MEDIA_BUS_FMT_SBGGR10_1X10;
 
        me->ops = &isp_subdev_media_ops;
-       me->function = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN;
+       me->function = MEDIA_ENT_F_PROC_VIDEO_ISP;
        ret = media_entity_pads_init(me, ATOMISP_SUBDEV_PADS_NUM, pads);
        if (ret < 0)
                return ret;

diff --git a/drivers/staging/media/atomisp/pci/atomisp_tpg.c b/drivers/staging/media/atomisp/pci/atomisp_tpg.c
index e29a96da5f98e9a6b16bc52d511d348fb21ab9b2..074826a5b70643e39e712ee331f9d6480fe33454 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_tpg.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_tpg.c
@@ -152,7 +152,7 @@ int atomisp_tpg_init(struct atomisp_device *isp)
        v4l2_set_subdevdata(sd, tpg);
 
        pads[0].flags = MEDIA_PAD_FL_SINK;
-       me->function = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN;
+       me->function = MEDIA_ENT_F_PROC_VIDEO_ISP;
 
        ret = media_entity_pads_init(me, 1, pads);
        if (ret < 0)