| Message ID | 02cb33521404120c6c8262187514fd9b3ec3eab3.1362387265.git.hans.verkuil@cisco.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Hi Hans, Thanks for the patch! On Mon, Mar 4, 2013 at 2:35 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote: > From: Hans Verkuil <hans.verkuil@cisco.com> > > Since vpbe_display already provides a g_std op setting current_norm > didn't do anything. Remove that code. > > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com> Regards, --Prabhakar Lad > --- > drivers/media/platform/davinci/vpbe_display.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c > index 1f59955..a9e90b0 100644 > --- a/drivers/media/platform/davinci/vpbe_display.c > +++ b/drivers/media/platform/davinci/vpbe_display.c > @@ -1176,10 +1176,6 @@ vpbe_display_s_dv_timings(struct file *file, void *priv, > "Failed to set the dv timings info\n"); > return -EINVAL; > } > - /* set the current norm to zero to be consistent. If STD is used > - * v4l2 layer will set the norm properly on successful s_std call > - */ > - layer->video_dev.current_norm = 0; > > return 0; > } > @@ -1693,12 +1689,8 @@ static int init_vpbe_layer(int i, struct vpbe_display *disp_dev, > vbd->vfl_dir = VFL_DIR_TX; > > if (disp_dev->vpbe_dev->current_timings.timings_type & > - VPBE_ENC_STD) { > + VPBE_ENC_STD) > vbd->tvnorms = (V4L2_STD_525_60 | V4L2_STD_625_50); > - vbd->current_norm = > - disp_dev->vpbe_dev->current_timings.std_id; > - } else > - vbd->current_norm = 0; > > snprintf(vbd->name, sizeof(vbd->name), > "DaVinci_VPBE Display_DRIVER_V%d.%d.%d", > -- > 1.7.10.4 >
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index 1f59955..a9e90b0 100644 --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c @@ -1176,10 +1176,6 @@ vpbe_display_s_dv_timings(struct file *file, void *priv, "Failed to set the dv timings info\n"); return -EINVAL; } - /* set the current norm to zero to be consistent. If STD is used - * v4l2 layer will set the norm properly on successful s_std call - */ - layer->video_dev.current_norm = 0; return 0; } @@ -1693,12 +1689,8 @@ static int init_vpbe_layer(int i, struct vpbe_display *disp_dev, vbd->vfl_dir = VFL_DIR_TX; if (disp_dev->vpbe_dev->current_timings.timings_type & - VPBE_ENC_STD) { + VPBE_ENC_STD) vbd->tvnorms = (V4L2_STD_525_60 | V4L2_STD_625_50); - vbd->current_norm = - disp_dev->vpbe_dev->current_timings.std_id; - } else - vbd->current_norm = 0; snprintf(vbd->name, sizeof(vbd->name), "DaVinci_VPBE Display_DRIVER_V%d.%d.%d",