Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] mcam-core: replace current_norm by g_std

The current_norm field is deprecated, replace this by properly
implementing g_std.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
8c84ac51 0dc5d82d

+7 -1
+7 -1
drivers/media/platform/marvell-ccic/mcam-core.c
··· 1344 1344 return 0; 1345 1345 } 1346 1346 1347 + static int mcam_vidioc_g_std(struct file *filp, void *priv, v4l2_std_id *a) 1348 + { 1349 + *a = V4L2_STD_NTSC_M; 1350 + return 0; 1351 + } 1352 + 1347 1353 /* 1348 1354 * G/S_PARM. Most of this is done by the sensor, but we are 1349 1355 * the level which controls the number of read buffers. ··· 1439 1433 .vidioc_g_input = mcam_vidioc_g_input, 1440 1434 .vidioc_s_input = mcam_vidioc_s_input, 1441 1435 .vidioc_s_std = mcam_vidioc_s_std, 1436 + .vidioc_g_std = mcam_vidioc_g_std, 1442 1437 .vidioc_reqbufs = mcam_vidioc_reqbufs, 1443 1438 .vidioc_querybuf = mcam_vidioc_querybuf, 1444 1439 .vidioc_qbuf = mcam_vidioc_qbuf, ··· 1565 1558 static struct video_device mcam_v4l_template = { 1566 1559 .name = "mcam", 1567 1560 .tvnorms = V4L2_STD_NTSC_M, 1568 - .current_norm = V4L2_STD_NTSC_M, /* make mplayer happy */ 1569 1561 1570 1562 .fops = &mcam_v4l_fops, 1571 1563 .ioctl_ops = &mcam_v4l_ioctl_ops,