1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
index 4ca0f9a2ad8a..33b9660b7f77 100644
--- a/drivers/media/platform/davinci/vpbe.c
+++ b/drivers/media/platform/davinci/vpbe.c
@@ -344,7 +344,7 @@ static int vpbe_s_dv_timings(struct vpbe_device *vpbe_dev,
                 return -EINVAL;
 
         for (i = 0; i < output->num_modes; i++) {
-                if (output->modes[i].timings_type == VPBE_ENC_CUSTOM_TIMINGS &&
+                if (output->modes[i].timings_type == VPBE_ENC_DV_TIMINGS &&
                     !memcmp(&output->modes[i].dv_timings,
                                 dv_timings, sizeof(*dv_timings)))
                         break;
@@ -385,7 +385,7 @@ static int vpbe_g_dv_timings(struct vpbe_device *vpbe_dev,
                      struct v4l2_dv_timings *dv_timings)
 {
         if (vpbe_dev->current_timings.timings_type &
-          VPBE_ENC_CUSTOM_TIMINGS) {
+          VPBE_ENC_DV_TIMINGS) {
                 *dv_timings = vpbe_dev->current_timings.dv_timings;
                 return 0;
         }
@@ -412,7 +412,7 @@ static int vpbe_enum_dv_timings(struct vpbe_device *vpbe_dev,
                 return -EINVAL;
 
         for (i = 0; i < output->num_modes; i++) {
-                if (output->modes[i].timings_type == VPBE_ENC_CUSTOM_TIMINGS) {
+                if (output->modes[i].timings_type == VPBE_ENC_DV_TIMINGS) {
                         if (j == timings->index)
                                 break;
                         j++;
@@ -431,7 +431,7 @@ static int vpbe_enum_dv_timings(struct vpbe_device *vpbe_dev,
  * Sets the standard if supported by the current encoder. Return the status.
  * 0 - success & -EINVAL on error
  */
-static int vpbe_s_std(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id)
+static int vpbe_s_std(struct vpbe_device *vpbe_dev, v4l2_std_id std_id)
 {
         struct vpbe_config *cfg = vpbe_dev->cfg;
         int out_index = vpbe_dev->current_out_index;
@@ -442,14 +442,14 @@ static int vpbe_s_std(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id)
                 V4L2_OUT_CAP_STD))
                 return -EINVAL;
 
-        ret = vpbe_get_std_info(vpbe_dev, *std_id);
+        ret = vpbe_get_std_info(vpbe_dev, std_id);
         if (ret)
                 return ret;
 
         mutex_lock(&vpbe_dev->lock);
 
         ret = v4l2_subdev_call(vpbe_dev->encoders[sd_index], video,
-                               s_std_output, *std_id);
+                               s_std_output, std_id);
         /* set the lcd controller output for the given mode */
         if (!ret) {
                 struct osd_state *osd_device = vpbe_dev->osd_device;
@@ -513,9 +513,9 @@ static int vpbe_set_mode(struct vpbe_device *vpbe_dev,
                          */
                         if (preset_mode->timings_type & VPBE_ENC_STD)
                                 return vpbe_s_std(vpbe_dev,
-                                                 &preset_mode->std_id);
+                                                 preset_mode->std_id);
                         if (preset_mode->timings_type &
-                                                VPBE_ENC_CUSTOM_TIMINGS) {
+                                                VPBE_ENC_DV_TIMINGS) {
                                 dv_timings =
                                         preset_mode->dv_timings;
                                 return vpbe_s_dv_timings(vpbe_dev, &dv_timings);