MLK-11661: ipuv3: Fix build warning
authorSandor Yu <R01008@freescale.com>
Wed, 30 Sep 2015 08:55:01 +0000 (16:55 +0800)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 19:48:46 +0000 (14:48 -0500)
Fix buiulding warning:
drivers/mxc/ipu3/ipu_disp.c:435:29: warning: initialization discards
'const' qualifier from pointer target type
[-Wdiscarded-array-qualifiers]
 {{DP_COM_CONF_CSC_DEF_BOTH, &rgb2ycbcr_coeff}, {0, 0}, {0, 0},
 {DP_COM_CONF_CSC_DEF_BG, &rgb2ycbcr_coeff}, {DP_COM_CONF_CSC_DEF_BG,
 &rgb2ycbcr_coeff} },

Signed-off-by: Sandor Yu <R01008@freescale.com>
drivers/mxc/ipu3/ipu_disp.c

index 633fc56..a983ba7 100644 (file)
@@ -432,11 +432,33 @@ static int _rgb_to_yuv(int n, int red, int green, int blue)
  * Column is for FG:   RGB2YUV YUV2RGB RGB2RGB YUV2YUV CSC_NONE
  */
 static struct dp_csc_param_t dp_csc_array[CSC_NUM][CSC_NUM] = {
-{{DP_COM_CONF_CSC_DEF_BOTH, &rgb2ycbcr_coeff}, {0, 0}, {0, 0}, {DP_COM_CONF_CSC_DEF_BG, &rgb2ycbcr_coeff}, {DP_COM_CONF_CSC_DEF_BG, &rgb2ycbcr_coeff} },
-{{0, 0}, {DP_COM_CONF_CSC_DEF_BOTH, &ycbcr2rgb_coeff}, {DP_COM_CONF_CSC_DEF_BG, &ycbcr2rgb_coeff}, {0, 0}, {DP_COM_CONF_CSC_DEF_BG, &ycbcr2rgb_coeff} },
-{{0, 0}, {DP_COM_CONF_CSC_DEF_FG, &ycbcr2rgb_coeff}, {0, 0}, {0, 0}, {0, 0} },
-{{DP_COM_CONF_CSC_DEF_FG, &rgb2ycbcr_coeff}, {0, 0}, {0, 0}, {0, 0}, {0, 0} },
-{{DP_COM_CONF_CSC_DEF_FG, &rgb2ycbcr_coeff}, {DP_COM_CONF_CSC_DEF_FG, &ycbcr2rgb_coeff}, {0, 0}, {0, 0}, {0, 0} }
+{
+       {DP_COM_CONF_CSC_DEF_BOTH, (void *)&rgb2ycbcr_coeff},
+       {0, 0}, {0, 0},
+       {DP_COM_CONF_CSC_DEF_BG, (void *)&rgb2ycbcr_coeff},
+       {DP_COM_CONF_CSC_DEF_BG, (void *)&rgb2ycbcr_coeff}
+},
+{
+       {0, 0},
+       {DP_COM_CONF_CSC_DEF_BOTH, (void *)&ycbcr2rgb_coeff},
+       {DP_COM_CONF_CSC_DEF_BG, (void *)&ycbcr2rgb_coeff},
+       {0, 0},
+       {DP_COM_CONF_CSC_DEF_BG, (void *)&ycbcr2rgb_coeff}
+},
+{
+       {0, 0},
+       {DP_COM_CONF_CSC_DEF_FG, (void *)&ycbcr2rgb_coeff},
+       {0, 0}, {0, 0}, {0, 0}
+},
+{
+       {DP_COM_CONF_CSC_DEF_FG, (void *)&rgb2ycbcr_coeff},
+       {0, 0}, {0, 0}, {0, 0}, {0, 0}
+},
+{
+       {DP_COM_CONF_CSC_DEF_FG, (void *)&rgb2ycbcr_coeff},
+       {DP_COM_CONF_CSC_DEF_FG, (void *)&ycbcr2rgb_coeff},
+       {0, 0}, {0, 0}, {0, 0}
+}
 };
 
 void __ipu_dp_csc_setup(struct ipu_soc *ipu,