[media] davinci/dm644x_ccdc: fix compiler warning

drivers/media/platform/davinci/dm644x_ccdc.c: In function ‘validate_ccdc_param’:
drivers/media/platform/davinci/dm644x_ccdc.c:233:32: warning: comparison between ‘enum ccdc_gama_width’ and ‘enum ccdc_data_size’ [-Wenum-compare]
It took a bit of work, see this thread of an earlier attempt to fix this:
https://patchwork.kernel.org/patch/1923091/
I've chosen not to follow the suggestions in that thread since gamma_width is
really a different property from data_size. What you really want is to know if
gamma_width fits inside data_size and for that you need to translate each
enum into a maximum bit number so you can safely compare the two.
So I put in two static inline translation functions instead, keeping the rest
of the code the same (except for fixing the 'gama' typo).

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/platform/davinci/dm644x_ccdc.c b/drivers/media/platform/davinci/dm644x_ccdc.c
index 318e805129984348cb6d3295c7caa71f0e9a2548..971d639b6674cccf37748fd366c563f363006be7 100644 (file)
--- a/drivers/media/platform/davinci/dm644x_ccdc.c
+++ b/drivers/media/platform/davinci/dm644x_ccdc.c
@@ -228,9 +228,12 @@ static void ccdc_readregs(void)
 static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam)
 {
        if (ccdcparam->alaw.enable) {
-               if ((ccdcparam->alaw.gama_wd > CCDC_GAMMA_BITS_09_0) ||
-                   (ccdcparam->alaw.gama_wd < CCDC_GAMMA_BITS_15_6) ||
-                   (ccdcparam->alaw.gama_wd < ccdcparam->data_sz)) {
+               u8 max_gamma = ccdc_gamma_width_max_bit(ccdcparam->alaw.gamma_wd);
+               u8 max_data = ccdc_data_size_max_bit(ccdcparam->data_sz);
+
+               if ((ccdcparam->alaw.gamma_wd > CCDC_GAMMA_BITS_09_0) ||
+                   (ccdcparam->alaw.gamma_wd < CCDC_GAMMA_BITS_15_6) ||
+                   (max_gamma > max_data)) {
                        dev_dbg(ccdc_cfg.dev, "\nInvalid data line select");
                        return -1;
                }
@@ -560,8 +563,8 @@ void ccdc_config_raw(void)
 
        /* Enable and configure aLaw register if needed */
        if (config_params->alaw.enable) {
-               val = ((config_params->alaw.gama_wd &
-                     CCDC_ALAW_GAMA_WD_MASK) | CCDC_ALAW_ENABLE);
+               val = ((config_params->alaw.gamma_wd &
+                     CCDC_ALAW_GAMMA_WD_MASK) | CCDC_ALAW_ENABLE);
                regw(val, CCDC_ALAW);
                dev_dbg(ccdc_cfg.dev, "\nWriting 0x%x to ALAW...\n", val);
        }

diff --git a/drivers/media/platform/davinci/dm644x_ccdc_regs.h b/drivers/media/platform/davinci/dm644x_ccdc_regs.h
index 90370e414e2cdf6279f87505bab335f37deb0191..2b0aca5383f0d1fef320b88d2d8b4991fd6ff0fd 100644 (file)
--- a/drivers/media/platform/davinci/dm644x_ccdc_regs.h
+++ b/drivers/media/platform/davinci/dm644x_ccdc_regs.h
@@ -84,7 +84,7 @@
 #define CCDC_VDHDEN_ENABLE                     (1 << 16)
 #define CCDC_LPF_ENABLE                                (1 << 14)
 #define CCDC_ALAW_ENABLE                       (1 << 3)
-#define CCDC_ALAW_GAMA_WD_MASK                 7
+#define CCDC_ALAW_GAMMA_WD_MASK                        7
 #define CCDC_BLK_CLAMP_ENABLE                  (1 << 31)
 #define CCDC_BLK_SGAIN_MASK                    0x1F
 #define CCDC_BLK_ST_PXL_MASK                   0x7FFF

diff --git a/include/media/davinci/dm644x_ccdc.h b/include/media/davinci/dm644x_ccdc.h
index 3e178eb52fb3502785e0215ca1f15c792e72bad7..852e96c4bb46b56d89ddb76d8b440bee01d20ce7 100644 (file)
--- a/include/media/davinci/dm644x_ccdc.h
+++ b/include/media/davinci/dm644x_ccdc.h
@@ -38,17 +38,23 @@ enum ccdc_sample_line {
        CCDC_SAMPLE_16LINES
 };
 
-/* enum for Alaw gama width */
-enum ccdc_gama_width {
-       CCDC_GAMMA_BITS_15_6,
+/* enum for Alaw gamma width */
+enum ccdc_gamma_width {
+       CCDC_GAMMA_BITS_15_6,   /* use bits 15-6 for gamma */
        CCDC_GAMMA_BITS_14_5,
        CCDC_GAMMA_BITS_13_4,
        CCDC_GAMMA_BITS_12_3,
        CCDC_GAMMA_BITS_11_2,
        CCDC_GAMMA_BITS_10_1,
-       CCDC_GAMMA_BITS_09_0
+       CCDC_GAMMA_BITS_09_0    /* use bits 9-0 for gamma */
 };
 
+/* returns the highest bit used for the gamma */
+static inline u8 ccdc_gamma_width_max_bit(enum ccdc_gamma_width width)
+{
+       return 15 - width;
+}
+
 enum ccdc_data_size {
        CCDC_DATA_16BITS,
        CCDC_DATA_15BITS,
@@ -60,12 +66,18 @@ enum ccdc_data_size {
        CCDC_DATA_8BITS
 };
 
+/* returns the highest bit used for this data size */
+static inline u8 ccdc_data_size_max_bit(enum ccdc_data_size sz)
+{
+       return sz == CCDC_DATA_8BITS ? 7 : 15 - sz;
+}
+
 /* structure for ALaw */
 struct ccdc_a_law {
        /* Enable/disable A-Law */
        unsigned char enable;
-       /* Gama Width Input */
-       enum ccdc_gama_width gama_wd;
+       /* Gamma Width Input */
+       enum ccdc_gamma_width gamma_wd;
 };
 
 /* structure for Black Clamping */