[media] sh_vou: remove current_norm

The current_norm field is deprecated and is replaced by g_std. This driver
already implements g_std, so just remove current_norm.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index fa8ae724152130937c24ca979f6812333a6262ff..7a9c5e9329f2655327c2c3d6a22e660a11728d38 100644 (file)
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -1282,7 +1282,6 @@ static const struct video_device sh_vou_video_template = {
        .fops           = &sh_vou_fops,
        .ioctl_ops      = &sh_vou_ioctl_ops,
        .tvnorms        = V4L2_STD_525_60, /* PAL only supported in 8-bit non-bt656 mode */
-       .current_norm   = V4L2_STD_NTSC_M,
        .vfl_dir        = VFL_DIR_TX,
 };
 
@@ -1321,7 +1320,7 @@ static int sh_vou_probe(struct platform_device *pdev)
        pix = &vou_dev->pix;
 
        /* Fill in defaults */
-       vou_dev->std            = sh_vou_video_template.current_norm;
+       vou_dev->std            = V4L2_STD_NTSC_M;
        rect->left              = 0;
        rect->top               = 0;
        rect->width             = VOU_MAX_IMAGE_WIDTH;