diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-03-15 05:10:40 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-24 05:47:00 -0400 |
| commit | 314527acbbb3f33f72c2ef19d8cfabcada9912a5 (patch) | |
| tree | 871021b9e888444f9f71f5c12ecf0272d77fdf8d /drivers/media/pci/cx18 | |
| parent | 2f73c7c582a685b3198b974cd6d964d0338f8ab5 (diff) | |
[media] v4l2: pass std by value to the write-only s_std ioctl
This ioctl is defined as IOW, so pass the argument by value instead of by
reference. I could have chosen to add const instead, but this is 1) easier
to handle in drivers and 2) consistent with the s_std subdev operation.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/cx18')
| -rw-r--r-- | drivers/media/pci/cx18/cx18-driver.c | 2 | ||||
| -rw-r--r-- | drivers/media/pci/cx18/cx18-ioctl.c | 10 | ||||
| -rw-r--r-- | drivers/media/pci/cx18/cx18-ioctl.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c index 613e5ae7d5ca..67b61cf3e03a 100644 --- a/drivers/media/pci/cx18/cx18-driver.c +++ b/drivers/media/pci/cx18/cx18-driver.c | |||
| @@ -1243,7 +1243,7 @@ int cx18_init_on_first_open(struct cx18 *cx) | |||
| 1243 | in one place. */ | 1243 | in one place. */ |
| 1244 | cx->std++; /* Force full standard initialization */ | 1244 | cx->std++; /* Force full standard initialization */ |
| 1245 | std = (cx->tuner_std == V4L2_STD_ALL) ? V4L2_STD_NTSC_M : cx->tuner_std; | 1245 | std = (cx->tuner_std == V4L2_STD_ALL) ? V4L2_STD_NTSC_M : cx->tuner_std; |
| 1246 | cx18_s_std(NULL, &fh, &std); | 1246 | cx18_s_std(NULL, &fh, std); |
| 1247 | cx18_s_frequency(NULL, &fh, &vf); | 1247 | cx18_s_frequency(NULL, &fh, &vf); |
| 1248 | return 0; | 1248 | return 0; |
| 1249 | } | 1249 | } |
diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c index 173ccd204c1f..254c50fabd73 100644 --- a/drivers/media/pci/cx18/cx18-ioctl.c +++ b/drivers/media/pci/cx18/cx18-ioctl.c | |||
| @@ -637,15 +637,15 @@ static int cx18_g_std(struct file *file, void *fh, v4l2_std_id *std) | |||
| 637 | return 0; | 637 | return 0; |
| 638 | } | 638 | } |
| 639 | 639 | ||
| 640 | int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std) | 640 | int cx18_s_std(struct file *file, void *fh, v4l2_std_id std) |
| 641 | { | 641 | { |
| 642 | struct cx18_open_id *id = fh2id(fh); | 642 | struct cx18_open_id *id = fh2id(fh); |
| 643 | struct cx18 *cx = id->cx; | 643 | struct cx18 *cx = id->cx; |
| 644 | 644 | ||
| 645 | if ((*std & V4L2_STD_ALL) == 0) | 645 | if ((std & V4L2_STD_ALL) == 0) |
| 646 | return -EINVAL; | 646 | return -EINVAL; |
| 647 | 647 | ||
| 648 | if (*std == cx->std) | 648 | if (std == cx->std) |
| 649 | return 0; | 649 | return 0; |
| 650 | 650 | ||
| 651 | if (test_bit(CX18_F_I_RADIO_USER, &cx->i_flags) || | 651 | if (test_bit(CX18_F_I_RADIO_USER, &cx->i_flags) || |
| @@ -656,8 +656,8 @@ int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std) | |||
| 656 | return -EBUSY; | 656 | return -EBUSY; |
| 657 | } | 657 | } |
| 658 | 658 | ||
| 659 | cx->std = *std; | 659 | cx->std = std; |
| 660 | cx->is_60hz = (*std & V4L2_STD_525_60) ? 1 : 0; | 660 | cx->is_60hz = (std & V4L2_STD_525_60) ? 1 : 0; |
| 661 | cx->is_50hz = !cx->is_60hz; | 661 | cx->is_50hz = !cx->is_60hz; |
| 662 | cx2341x_handler_set_50hz(&cx->cxhdl, cx->is_50hz); | 662 | cx2341x_handler_set_50hz(&cx->cxhdl, cx->is_50hz); |
| 663 | cx->cxhdl.width = 720; | 663 | cx->cxhdl.width = 720; |
diff --git a/drivers/media/pci/cx18/cx18-ioctl.h b/drivers/media/pci/cx18/cx18-ioctl.h index aa9b44a611d3..43433969d633 100644 --- a/drivers/media/pci/cx18/cx18-ioctl.h +++ b/drivers/media/pci/cx18/cx18-ioctl.h | |||
| @@ -26,6 +26,6 @@ u16 cx18_service2vbi(int type); | |||
| 26 | void cx18_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal); | 26 | void cx18_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal); |
| 27 | u16 cx18_get_service_set(struct v4l2_sliced_vbi_format *fmt); | 27 | u16 cx18_get_service_set(struct v4l2_sliced_vbi_format *fmt); |
| 28 | void cx18_set_funcs(struct video_device *vdev); | 28 | void cx18_set_funcs(struct video_device *vdev); |
| 29 | int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std); | 29 | int cx18_s_std(struct file *file, void *fh, v4l2_std_id std); |
| 30 | int cx18_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf); | 30 | int cx18_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf); |
| 31 | int cx18_s_input(struct file *file, void *fh, unsigned int inp); | 31 | int cx18_s_input(struct file *file, void *fh, unsigned int inp); |