[media] V4L: Remove "_ACTIVE" from the selection target name definitions

This patch drops the _ACTIVE part from the selection target names
as a prerequisite to unify the selection target names across the subdev
and regular video node API.

The meaning of V4L2_SEL_TGT_*_ACTIVE and V4L2_SUBDEV_SEL_TGT_*_ACTUAL
selection targets is logically the same. Different names add to confusion
where both APIs are used in a single driver or an application. For some
system configurations different names may lead to interoperability issues.

For backwards compatibility V4L2_SEL_TGT_CROP_ACTIVE and
V4L2_SEL_TGT_COMPOSE_ACTIVE are defined as aliases to V4L2_SEL_TGT_CROP
and V4L2_SEL_TGT_COMPOSE. These aliases will be removed after deprecation
period, according to Documentation/feature-removal-schedule.txt.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

4 files changed, 15 insertions, 15 deletions

diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index 62ce5399c4cf..a3cd78d33913 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -655,7 +655,7 @@ static void fimc_capture_try_selection(struct fimc_ctx *ctx,
                 r->left   = r->top = 0;
                 return;
         }
-        if (target == V4L2_SEL_TGT_COMPOSE_ACTIVE) {
+        if (target == V4L2_SEL_TGT_COMPOSE) {
                 if (ctx->rotation != 90 && ctx->rotation != 270)
                         align_h = 1;
                 max_sc_h = min(SCALER_MAX_HRATIO, 1 << (ffs(sink->width) - 3));
@@ -682,7 +682,7 @@ static void fimc_capture_try_selection(struct fimc_ctx *ctx,
                       rotate ? sink->f_height : sink->f_width);
         max_h = min_t(u32, FIMC_CAMIF_MAX_HEIGHT, sink->f_height);
 
-        if (target == V4L2_SEL_TGT_COMPOSE_ACTIVE) {
+        if (target == V4L2_SEL_TGT_COMPOSE) {
                 min_w = min_t(u32, max_w, sink->f_width / max_sc_h);
                 min_h = min_t(u32, max_h, sink->f_height / max_sc_v);
                 if (rotate) {
@@ -1147,9 +1147,9 @@ static int fimc_cap_g_selection(struct file *file, void *fh,
                 s->r.height = f->o_height;
                 return 0;
 
-        case V4L2_SEL_TGT_COMPOSE_ACTIVE:
+        case V4L2_SEL_TGT_COMPOSE:
                 f = &ctx->d_frame;
-        case V4L2_SEL_TGT_CROP_ACTIVE:
+        case V4L2_SEL_TGT_CROP:
                 s->r.left = f->offs_h;
                 s->r.top = f->offs_v;
                 s->r.width = f->width;
@@ -1185,9 +1185,9 @@ static int fimc_cap_s_selection(struct file *file, void *fh,
         if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
                 return -EINVAL;
 
-        if (s->target == V4L2_SEL_TGT_COMPOSE_ACTIVE)
+        if (s->target == V4L2_SEL_TGT_COMPOSE)
                 f = &ctx->d_frame;
-        else if (s->target == V4L2_SEL_TGT_CROP_ACTIVE)
+        else if (s->target == V4L2_SEL_TGT_CROP)
                 f = &ctx->s_frame;
         else
                 return -EINVAL;
@@ -1483,7 +1483,7 @@ static int fimc_subdev_set_selection(struct v4l2_subdev *sd,
                 return -EINVAL;
 
         mutex_lock(&fimc->lock);
-        fimc_capture_try_selection(ctx, r, V4L2_SEL_TGT_CROP_ACTIVE);
+        fimc_capture_try_selection(ctx, r, V4L2_SEL_TGT_CROP);
 
         switch (sel->target) {
         case V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS:
diff --git a/drivers/media/video/s5p-fimc/fimc-lite.c b/drivers/media/video/s5p-fimc/fimc-lite.c
index 400d701aef04..52ede56e0758 100644
--- a/drivers/media/video/s5p-fimc/fimc-lite.c
+++ b/drivers/media/video/s5p-fimc/fimc-lite.c
@@ -871,7 +871,7 @@ static int fimc_lite_g_selection(struct file *file, void *fh,
                 sel->r.height = f->f_height;
                 return 0;
 
-        case V4L2_SEL_TGT_COMPOSE_ACTIVE:
+        case V4L2_SEL_TGT_COMPOSE:
                 sel->r = f->rect;
                 return 0;
         }
@@ -888,7 +888,7 @@ static int fimc_lite_s_selection(struct file *file, void *fh,
         unsigned long flags;
 
         if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ||
-            sel->target != V4L2_SEL_TGT_COMPOSE_ACTIVE)
+            sel->target != V4L2_SEL_TGT_COMPOSE)
                 return -EINVAL;
 
         fimc_lite_try_compose(fimc, &rect);
diff --git a/drivers/media/video/s5p-jpeg/jpeg-core.c b/drivers/media/video/s5p-jpeg/jpeg-core.c
index e40e79b33df6..95f23024b17d 100644
--- a/drivers/media/video/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/video/s5p-jpeg/jpeg-core.c
@@ -824,10 +824,10 @@ static int s5p_jpeg_g_selection(struct file *file, void *priv,
 
         /* For JPEG blob active == default == bounds */
         switch (s->target) {
-        case V4L2_SEL_TGT_CROP_ACTIVE:
+        case V4L2_SEL_TGT_CROP:
         case V4L2_SEL_TGT_CROP_BOUNDS:
         case V4L2_SEL_TGT_CROP_DEFAULT:
-        case V4L2_SEL_TGT_COMPOSE_ACTIVE:
+        case V4L2_SEL_TGT_COMPOSE:
         case V4L2_SEL_TGT_COMPOSE_DEFAULT:
                 s->r.width = ctx->out_q.w;
                 s->r.height = ctx->out_q.h;
diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c
index 33fde2a763ec..6c74b05d1f95 100644
--- a/drivers/media/video/s5p-tv/mixer_video.c
+++ b/drivers/media/video/s5p-tv/mixer_video.c
@@ -367,7 +367,7 @@ static int mxr_g_selection(struct file *file, void *fh,
                 return -EINVAL;
 
         switch (s->target) {
-        case V4L2_SEL_TGT_CROP_ACTIVE:
+        case V4L2_SEL_TGT_CROP:
                 s->r.left = geo->src.x_offset;
                 s->r.top = geo->src.y_offset;
                 s->r.width = geo->src.width;
@@ -380,7 +380,7 @@ static int mxr_g_selection(struct file *file, void *fh,
                 s->r.width = geo->src.full_width;
                 s->r.height = geo->src.full_height;
                 break;
-        case V4L2_SEL_TGT_COMPOSE_ACTIVE:
+        case V4L2_SEL_TGT_COMPOSE:
         case V4L2_SEL_TGT_COMPOSE_PADDED:
                 s->r.left = geo->dst.x_offset;
                 s->r.top = geo->dst.y_offset;
@@ -449,11 +449,11 @@ static int mxr_s_selection(struct file *file, void *fh,
                 res.height = geo->dst.full_height;
                 break;
 
-        case V4L2_SEL_TGT_CROP_ACTIVE:
+        case V4L2_SEL_TGT_CROP:
                 target = &geo->src;
                 stage = MXR_GEOMETRY_CROP;
                 break;
-        case V4L2_SEL_TGT_COMPOSE_ACTIVE:
+        case V4L2_SEL_TGT_COMPOSE:
         case V4L2_SEL_TGT_COMPOSE_PADDED:
                 target = &geo->dst;
                 stage = MXR_GEOMETRY_COMPOSE;