[media] v4l2-ctrls: use ptrs for all but the s32 type

Rather than having two unions for all types just keep 'val' and
'cur.val' and use the p_cur and p_new unions to access all others.

The only reason for keeping 'val' and 'cur.val' is that it is used
all over, so converting this as well would be a huge job.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c
index 65e6e1a9d104..435e9e661bbb 100644
--- a/drivers/media/i2c/mt9v032.c
+++ b/drivers/media/i2c/mt9v032.c
@@ -667,7 +667,7 @@ static int mt9v032_s_ctrl(struct v4l2_ctrl *ctrl)
                         break;
 
                 freq = mt9v032->pdata->link_freqs[mt9v032->link_freq->val];
-                mt9v032->pixel_rate->val64 = freq;
+                *mt9v032->pixel_rate->p_new.p_s64 = freq;
                 mt9v032->sysclk = freq;
                 break;
 
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 72350f0befc5..13411e9a0e25 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -297,8 +297,8 @@ static int smiapp_pll_update(struct smiapp_sensor *sensor)
         if (rval < 0)
                 return rval;
 
-        sensor->pixel_rate_parray->cur.val64 = pll->vt_pix_clk_freq_hz;
-        sensor->pixel_rate_csi->cur.val64 = pll->pixel_rate_csi;
+        *sensor->pixel_rate_parray->p_cur.p_s64 = pll->vt_pix_clk_freq_hz;
+        *sensor->pixel_rate_csi->p_cur.p_s64 = pll->pixel_rate_csi;
 
         return 0;
 }