[media] v4l: Unify selection targets across V4L2 and V4L2 subdev interfaces

Change the users of V4L2_SUBDEV_SEL_TGT_* targets to use V4L2_SEL_TGT_*
instead. The common definitions are moved to a new header file,
include/linux/v4l2-common.h.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 14 insertions, 15 deletions

diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index a3cd78d33913..521e3715b9ee 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -1429,9 +1429,9 @@ static int fimc_subdev_get_selection(struct v4l2_subdev *sd,
         mutex_lock(&fimc->lock);
 
         switch (sel->target) {
-        case V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS:
+        case V4L2_SEL_TGT_COMPOSE_BOUNDS:
                 f = &ctx->d_frame;
-        case V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS:
+        case V4L2_SEL_TGT_CROP_BOUNDS:
                 r->width = f->o_width;
                 r->height = f->o_height;
                 r->left = 0;
@@ -1439,10 +1439,10 @@ static int fimc_subdev_get_selection(struct v4l2_subdev *sd,
                 mutex_unlock(&fimc->lock);
                 return 0;
 
-        case V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL:
+        case V4L2_SEL_TGT_CROP:
                 try_sel = v4l2_subdev_get_try_crop(fh, sel->pad);
                 break;
-        case V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL:
+        case V4L2_SEL_TGT_COMPOSE:
                 try_sel = v4l2_subdev_get_try_compose(fh, sel->pad);
                 f = &ctx->d_frame;
                 break;
@@ -1486,9 +1486,9 @@ static int fimc_subdev_set_selection(struct v4l2_subdev *sd,
         fimc_capture_try_selection(ctx, r, V4L2_SEL_TGT_CROP);
 
         switch (sel->target) {
-        case V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS:
+        case V4L2_SEL_TGT_COMPOSE_BOUNDS:
                 f = &ctx->d_frame;
-        case V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS:
+        case V4L2_SEL_TGT_CROP_BOUNDS:
                 r->width = f->o_width;
                 r->height = f->o_height;
                 r->left = 0;
@@ -1496,10 +1496,10 @@ static int fimc_subdev_set_selection(struct v4l2_subdev *sd,
                 mutex_unlock(&fimc->lock);
                 return 0;
 
-        case V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL:
+        case V4L2_SEL_TGT_CROP:
                 try_sel = v4l2_subdev_get_try_crop(fh, sel->pad);
                 break;
-        case V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL:
+        case V4L2_SEL_TGT_COMPOSE:
                 try_sel = v4l2_subdev_get_try_compose(fh, sel->pad);
                 f = &ctx->d_frame;
                 break;
@@ -1515,7 +1515,7 @@ static int fimc_subdev_set_selection(struct v4l2_subdev *sd,
                 set_frame_crop(f, r->left, r->top, r->width, r->height);
                 set_bit(ST_CAPT_APPLY_CFG, &fimc->state);
                 spin_unlock_irqrestore(&fimc->slock, flags);
-                if (sel->target == V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL)
+                if (sel->target == V4L2_SEL_TGT_COMPOSE)
                         ctx->state |= FIMC_COMPOSE;
         }
 
diff --git a/drivers/media/video/s5p-fimc/fimc-lite.c b/drivers/media/video/s5p-fimc/fimc-lite.c
index 52ede56e0758..8785089c4460 100644
--- a/drivers/media/video/s5p-fimc/fimc-lite.c
+++ b/drivers/media/video/s5p-fimc/fimc-lite.c
@@ -1086,9 +1086,9 @@ static int fimc_lite_subdev_get_selection(struct v4l2_subdev *sd,
         struct fimc_lite *fimc = v4l2_get_subdevdata(sd);
         struct flite_frame *f = &fimc->inp_frame;
 
-        if ((sel->target != V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL &&
-             sel->target != V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS) ||
-            sel->pad != FLITE_SD_PAD_SINK)
+        if ((sel->target != V4L2_SEL_TGT_CROP &&
+             sel->target != V4L2_SEL_TGT_CROP_BOUNDS) ||
+             sel->pad != FLITE_SD_PAD_SINK)
                 return -EINVAL;
 
         if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
@@ -1097,7 +1097,7 @@ static int fimc_lite_subdev_get_selection(struct v4l2_subdev *sd,
         }
 
         mutex_lock(&fimc->lock);
-        if (sel->target == V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL) {
+        if (sel->target == V4L2_SEL_TGT_CROP) {
                 sel->r = f->rect;
         } else {
                 sel->r.left = 0;
@@ -1122,8 +1122,7 @@ static int fimc_lite_subdev_set_selection(struct v4l2_subdev *sd,
         struct flite_frame *f = &fimc->inp_frame;
         int ret = 0;
 
-        if (sel->target != V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL ||
-            sel->pad != FLITE_SD_PAD_SINK)
+        if (sel->target != V4L2_SEL_TGT_CROP || sel->pad != FLITE_SD_PAD_SINK)
                 return -EINVAL;
 
         mutex_lock(&fimc->lock);