[media] v4l: exynos4-is: Drop unneeded check when setting up fimc-lite links
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tue, 1 Mar 2016 09:31:53 +0000 (06:31 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Sat, 5 Mar 2016 12:10:01 +0000 (09:10 -0300)
The driver verifies that the type of the remote entity matches its
expectations when setting up fimc-lite links and returns an error if it
doesn't. Those checks can never fail as the links are created by the
driver in a way that always match its expectations (the SINK and
SOURCE_ISP pads are connected to subdevs only and the SOURCE_DMA pad is
connected to a video node only). Remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/platform/exynos4-is/fimc-lite.c

index e85649147dc8d9e213f05a2a4de005b1fc073e75..dc1b929f7a33d0a2f4e6a8ea04733a02123fcc36 100644 (file)
@@ -992,10 +992,6 @@ static int fimc_lite_link_setup(struct media_entity *entity,
 
        switch (local->index) {
        case FLITE_SD_PAD_SINK:
-               if (!is_media_entity_v4l2_subdev(remote->entity)) {
-                       ret = -EINVAL;
-                       break;
-               }
                if (flags & MEDIA_LNK_FL_ENABLED) {
                        if (fimc->source_subdev_grp_id == 0)
                                fimc->source_subdev_grp_id = sd->grp_id;
@@ -1010,19 +1006,15 @@ static int fimc_lite_link_setup(struct media_entity *entity,
        case FLITE_SD_PAD_SOURCE_DMA:
                if (!(flags & MEDIA_LNK_FL_ENABLED))
                        atomic_set(&fimc->out_path, FIMC_IO_NONE);
-               else if (is_media_entity_v4l2_io(remote->entity))
-                       atomic_set(&fimc->out_path, FIMC_IO_DMA);
                else
-                       ret = -EINVAL;
+                       atomic_set(&fimc->out_path, FIMC_IO_DMA);
                break;
 
        case FLITE_SD_PAD_SOURCE_ISP:
                if (!(flags & MEDIA_LNK_FL_ENABLED))
                        atomic_set(&fimc->out_path, FIMC_IO_NONE);
-               else if (is_media_entity_v4l2_subdev(remote->entity))
-                       atomic_set(&fimc->out_path, FIMC_IO_ISP);
                else
-                       ret = -EINVAL;
+                       atomic_set(&fimc->out_path, FIMC_IO_ISP);
                break;
 
        default: