[media] v4l: Unify selection flags

Unify flags on the selection interfaces on V4L2 and V4L2 subdev. Flags are
very similar to targets in this case: there are more similarities than
differences between the two interfaces.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/media/video/smiapp/smiapp-core.c b/drivers/media/video/smiapp/smiapp-core.c
index 9bbb5d3f003b..8a5d4f7932a0 100644
--- a/drivers/media/video/smiapp/smiapp-core.c
+++ b/drivers/media/video/smiapp/smiapp-core.c
@@ -38,9 +38,9 @@
 
 #include "smiapp.h"
 
-#define SMIAPP_ALIGN_DIM(dim, flags)            \
-        ((flags) & V4L2_SUBDEV_SEL_FLAG_SIZE_GE \
-         ? ALIGN((dim), 2)                      \
+#define SMIAPP_ALIGN_DIM(dim, flags)    \
+        ((flags) & V4L2_SEL_FLAG_GE     \
+         ? ALIGN((dim), 2)              \
          : (dim) & ~1)
 
 /*
@@ -1747,14 +1747,14 @@ static int scaling_goodness(struct v4l2_subdev *subdev, int w, int ask_w,
         h &= ~1;
         ask_h &= ~1;
 
-        if (flags & V4L2_SUBDEV_SEL_FLAG_SIZE_GE) {
+        if (flags & V4L2_SEL_FLAG_GE) {
                 if (w < ask_w)
                         val -= SCALING_GOODNESS;
                 if (h < ask_h)
                         val -= SCALING_GOODNESS;
         }
 
-        if (flags & V4L2_SUBDEV_SEL_FLAG_SIZE_LE) {
+        if (flags & V4L2_SEL_FLAG_LE) {
                 if (w > ask_w)
                         val -= SCALING_GOODNESS;
                 if (h > ask_h)