[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>

1 files changed, 6 insertions, 2 deletions

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index a61edb353273..ac1ad33ba3e0 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -767,13 +767,13 @@ struct v4l2_crop {
 /* Selection targets */
 
 /* Current cropping area */
-#define V4L2_SEL_TGT_CROP_ACTIVE        0x0000
+#define V4L2_SEL_TGT_CROP               0x0000
 /* Default cropping area */
 #define V4L2_SEL_TGT_CROP_DEFAULT       0x0001
 /* Cropping bounds */
 #define V4L2_SEL_TGT_CROP_BOUNDS        0x0002
 /* Current composing area */
-#define V4L2_SEL_TGT_COMPOSE_ACTIVE     0x0100
+#define V4L2_SEL_TGT_COMPOSE            0x0100
 /* Default composing area */
 #define V4L2_SEL_TGT_COMPOSE_DEFAULT    0x0101
 /* Composing bounds */
@@ -781,6 +781,10 @@ struct v4l2_crop {
 /* Current composing area plus all padding pixels */
 #define V4L2_SEL_TGT_COMPOSE_PADDED     0x0103
 
+/* Backward compatibility definitions */
+#define V4L2_SEL_TGT_CROP_ACTIVE        V4L2_SEL_TGT_CROP
+#define V4L2_SEL_TGT_COMPOSE_ACTIVE     V4L2_SEL_TGT_COMPOSE
+
 /**
  * struct v4l2_selection - selection info
  * @type:       buffer type (do not use *_MPLANE types)