[media] omap3isp: preview: Merge configuration and feature bits

The preview engine parameters are referenced by a value suitable for
being used in a bitmask. Two macros named OMAP3ISP_PREV_* and PREV_* are
declared for each parameter and are used interchangeably. Remove the
private macro.

Replace the configuration bit field in the parameter update attributes
structure with a boolean that indicates whether the parameter can be
updated through the preview engine configuration ioctl.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 4 insertions, 22 deletions

diff --git a/drivers/media/video/omap3isp/isppreview.h b/drivers/media/video/omap3isp/isppreview.h
index b7f979a18dab..a0d28070a853 100644
--- a/drivers/media/video/omap3isp/isppreview.h
+++ b/drivers/media/video/omap3isp/isppreview.h
@@ -45,28 +45,10 @@
 #define ISPPRV_CONTRAST_HIGH            0xFF
 #define ISPPRV_CONTRAST_UNITS           0x1
 
-/* Features list */
-#define PREV_LUMA_ENHANCE               OMAP3ISP_PREV_LUMAENH
-#define PREV_INVERSE_ALAW               OMAP3ISP_PREV_INVALAW
-#define PREV_HORZ_MEDIAN_FILTER         OMAP3ISP_PREV_HRZ_MED
-#define PREV_CFA                        OMAP3ISP_PREV_CFA
-#define PREV_CHROMA_SUPPRESS            OMAP3ISP_PREV_CHROMA_SUPP
-#define PREV_WB                         OMAP3ISP_PREV_WB
-#define PREV_BLKADJ                     OMAP3ISP_PREV_BLKADJ
-#define PREV_RGB2RGB                    OMAP3ISP_PREV_RGB2RGB
-#define PREV_COLOR_CONV                 OMAP3ISP_PREV_COLOR_CONV
-#define PREV_YCLIMITS                   OMAP3ISP_PREV_YC_LIMIT
-#define PREV_DEFECT_COR                 OMAP3ISP_PREV_DEFECT_COR
-#define PREV_GAMMA_BYPASS               OMAP3ISP_PREV_GAMMABYPASS
-#define PREV_DARK_FRAME_CAPTURE         OMAP3ISP_PREV_DRK_FRM_CAPTURE
-#define PREV_DARK_FRAME_SUBTRACT        OMAP3ISP_PREV_DRK_FRM_SUBTRACT
-#define PREV_LENS_SHADING               OMAP3ISP_PREV_LENS_SHADING
-#define PREV_NOISE_FILTER               OMAP3ISP_PREV_NF
-#define PREV_GAMMA                      OMAP3ISP_PREV_GAMMA
-
-#define PREV_CONTRAST                   (1 << 17)
-#define PREV_BRIGHTNESS                 (1 << 18)
-#define PREV_FEATURES_END               (1 << 19)
+/* Additional features not listed in linux/omap3isp.h */
+#define OMAP3ISP_PREV_CONTRAST          (1 << 17)
+#define OMAP3ISP_PREV_BRIGHTNESS        (1 << 18)
+#define OMAP3ISP_PREV_FEATURES_END      (1 << 19)
 
 enum preview_input_entity {
         PREVIEW_INPUT_NONE,