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

[media] au0828: replace deprecated current_norm by g_std

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
33b6b89b 8d86e4e8

+13 -1
+12 -1
drivers/media/usb/au0828/au0828-video.c
··· 1339 1339 1340 1340 if (dev->dvb.frontend && dev->dvb.frontend->ops.analog_ops.i2c_gate_ctrl) 1341 1341 dev->dvb.frontend->ops.analog_ops.i2c_gate_ctrl(dev->dvb.frontend, 0); 1342 + dev->std = norm; 1342 1343 1344 + return 0; 1345 + } 1346 + 1347 + static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *norm) 1348 + { 1349 + struct au0828_fh *fh = priv; 1350 + struct au0828_dev *dev = fh->dev; 1351 + 1352 + *norm = dev->std; 1343 1353 return 0; 1344 1354 } 1345 1355 ··· 1900 1890 .vidioc_qbuf = vidioc_qbuf, 1901 1891 .vidioc_dqbuf = vidioc_dqbuf, 1902 1892 .vidioc_s_std = vidioc_s_std, 1893 + .vidioc_g_std = vidioc_g_std, 1903 1894 .vidioc_enum_input = vidioc_enum_input, 1904 1895 .vidioc_g_input = vidioc_g_input, 1905 1896 .vidioc_s_input = vidioc_s_input, ··· 1925 1914 .release = video_device_release, 1926 1915 .ioctl_ops = &video_ioctl_ops, 1927 1916 .tvnorms = V4L2_STD_NTSC_M, 1928 - .current_norm = V4L2_STD_NTSC_M, 1929 1917 }; 1930 1918 1931 1919 /**************************************************************************/ ··· 1993 1983 dev->bytesperline = dev->width << 1; 1994 1984 dev->ctrl_ainput = 0; 1995 1985 dev->ctrl_freq = 960; 1986 + dev->std = V4L2_STD_NTSC_M; 1996 1987 1997 1988 /* allocate and fill v4l2 video struct */ 1998 1989 dev->vdev = video_device_alloc();
+1
drivers/media/usb/au0828/au0828.h
··· 222 222 int vbi_width; 223 223 int vbi_height; 224 224 u32 vbi_read; 225 + v4l2_std_id std; 225 226 u32 field_size; 226 227 u32 frame_size; 227 228 u32 bytesperline;