diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-09-17 04:05:25 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-26 09:43:04 -0400 |
commit | d88aab53bd267c9fb0b0451e9acae68091703eab (patch) | |
tree | 5da9b54e8fe4173a0a25b87bc350884d277f9bac /drivers/media/usb | |
parent | e6eb28c2207b9397d0ab56e238865a4ee95b7ef9 (diff) |
[media] v4l2: make vidioc_s_jpegcomp const
Write-only ioctls should have a const argument in the ioctl op.
Do this conversion for vidioc_s_jpegcomp.
Adding const for write-only ioctls was decided during the 2012 Media Workshop.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb')
-rw-r--r-- | drivers/media/usb/cpia2/cpia2_v4l.c | 5 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gspca.c | 2 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gspca.h | 8 | ||||
-rw-r--r-- | drivers/media/usb/gspca/jeilinj.c | 2 | ||||
-rw-r--r-- | drivers/media/usb/gspca/ov519.c | 2 | ||||
-rw-r--r-- | drivers/media/usb/gspca/topro.c | 2 | ||||
-rw-r--r-- | drivers/media/usb/gspca/zc3xx.c | 9 | ||||
-rw-r--r-- | drivers/media/usb/s2255/s2255drv.c | 2 |
8 files changed, 14 insertions, 18 deletions
diff --git a/drivers/media/usb/cpia2/cpia2_v4l.c b/drivers/media/usb/cpia2/cpia2_v4l.c index 5ca6f44b4c63..aeb9d2275725 100644 --- a/drivers/media/usb/cpia2/cpia2_v4l.c +++ b/drivers/media/usb/cpia2/cpia2_v4l.c | |||
@@ -734,7 +734,8 @@ static int cpia2_g_jpegcomp(struct file *file, void *fh, struct v4l2_jpegcompres | |||
734 | * | 734 | * |
735 | *****************************************************************************/ | 735 | *****************************************************************************/ |
736 | 736 | ||
737 | static int cpia2_s_jpegcomp(struct file *file, void *fh, struct v4l2_jpegcompression *parms) | 737 | static int cpia2_s_jpegcomp(struct file *file, void *fh, |
738 | const struct v4l2_jpegcompression *parms) | ||
738 | { | 739 | { |
739 | struct camera_data *cam = video_drvdata(file); | 740 | struct camera_data *cam = video_drvdata(file); |
740 | 741 | ||
@@ -743,8 +744,6 @@ static int cpia2_s_jpegcomp(struct file *file, void *fh, struct v4l2_jpegcompres | |||
743 | 744 | ||
744 | cam->params.compression.inhibit_htables = | 745 | cam->params.compression.inhibit_htables = |
745 | !(parms->jpeg_markers & V4L2_JPEG_MARKER_DHT); | 746 | !(parms->jpeg_markers & V4L2_JPEG_MARKER_DHT); |
746 | parms->jpeg_markers &= V4L2_JPEG_MARKER_DQT | V4L2_JPEG_MARKER_DRI | | ||
747 | V4L2_JPEG_MARKER_DHT; | ||
748 | 747 | ||
749 | if(parms->APP_len != 0) { | 748 | if(parms->APP_len != 0) { |
750 | if(parms->APP_len > 0 && | 749 | if(parms->APP_len > 0 && |
diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c index 2abbf52c781a..a2b934146ebf 100644 --- a/drivers/media/usb/gspca/gspca.c +++ b/drivers/media/usb/gspca/gspca.c | |||
@@ -1686,7 +1686,7 @@ static int vidioc_g_jpegcomp(struct file *file, void *priv, | |||
1686 | } | 1686 | } |
1687 | 1687 | ||
1688 | static int vidioc_s_jpegcomp(struct file *file, void *priv, | 1688 | static int vidioc_s_jpegcomp(struct file *file, void *priv, |
1689 | struct v4l2_jpegcompression *jpegcomp) | 1689 | const struct v4l2_jpegcompression *jpegcomp) |
1690 | { | 1690 | { |
1691 | struct gspca_dev *gspca_dev = video_drvdata(file); | 1691 | struct gspca_dev *gspca_dev = video_drvdata(file); |
1692 | 1692 | ||
diff --git a/drivers/media/usb/gspca/gspca.h b/drivers/media/usb/gspca/gspca.h index dc688c7f5e48..e3eab82cd4e5 100644 --- a/drivers/media/usb/gspca/gspca.h +++ b/drivers/media/usb/gspca/gspca.h | |||
@@ -83,8 +83,10 @@ struct gspca_frame; | |||
83 | typedef int (*cam_op) (struct gspca_dev *); | 83 | typedef int (*cam_op) (struct gspca_dev *); |
84 | typedef void (*cam_v_op) (struct gspca_dev *); | 84 | typedef void (*cam_v_op) (struct gspca_dev *); |
85 | typedef int (*cam_cf_op) (struct gspca_dev *, const struct usb_device_id *); | 85 | typedef int (*cam_cf_op) (struct gspca_dev *, const struct usb_device_id *); |
86 | typedef int (*cam_jpg_op) (struct gspca_dev *, | 86 | typedef int (*cam_get_jpg_op) (struct gspca_dev *, |
87 | struct v4l2_jpegcompression *); | 87 | struct v4l2_jpegcompression *); |
88 | typedef int (*cam_set_jpg_op) (struct gspca_dev *, | ||
89 | const struct v4l2_jpegcompression *); | ||
88 | typedef int (*cam_reg_op) (struct gspca_dev *, | 90 | typedef int (*cam_reg_op) (struct gspca_dev *, |
89 | struct v4l2_dbg_register *); | 91 | struct v4l2_dbg_register *); |
90 | typedef int (*cam_ident_op) (struct gspca_dev *, | 92 | typedef int (*cam_ident_op) (struct gspca_dev *, |
@@ -126,8 +128,8 @@ struct sd_desc { | |||
126 | cam_v_op stopN; /* called on stream off - main alt */ | 128 | cam_v_op stopN; /* called on stream off - main alt */ |
127 | cam_v_op stop0; /* called on stream off & disconnect - alt 0 */ | 129 | cam_v_op stop0; /* called on stream off & disconnect - alt 0 */ |
128 | cam_v_op dq_callback; /* called when a frame has been dequeued */ | 130 | cam_v_op dq_callback; /* called when a frame has been dequeued */ |
129 | cam_jpg_op get_jcomp; | 131 | cam_get_jpg_op get_jcomp; |
130 | cam_jpg_op set_jcomp; | 132 | cam_set_jpg_op set_jcomp; |
131 | cam_qmnu_op querymenu; | 133 | cam_qmnu_op querymenu; |
132 | cam_streamparm_op get_streamparm; | 134 | cam_streamparm_op get_streamparm; |
133 | cam_streamparm_op set_streamparm; | 135 | cam_streamparm_op set_streamparm; |
diff --git a/drivers/media/usb/gspca/jeilinj.c b/drivers/media/usb/gspca/jeilinj.c index 26b99310d628..b897aa86f315 100644 --- a/drivers/media/usb/gspca/jeilinj.c +++ b/drivers/media/usb/gspca/jeilinj.c | |||
@@ -474,7 +474,7 @@ static int sd_init_controls(struct gspca_dev *gspca_dev) | |||
474 | } | 474 | } |
475 | 475 | ||
476 | static int sd_set_jcomp(struct gspca_dev *gspca_dev, | 476 | static int sd_set_jcomp(struct gspca_dev *gspca_dev, |
477 | struct v4l2_jpegcompression *jcomp) | 477 | const struct v4l2_jpegcompression *jcomp) |
478 | { | 478 | { |
479 | struct sd *sd = (struct sd *) gspca_dev; | 479 | struct sd *sd = (struct sd *) gspca_dev; |
480 | 480 | ||
diff --git a/drivers/media/usb/gspca/ov519.c b/drivers/media/usb/gspca/ov519.c index c1a21bfb4be7..9aa09f845ce4 100644 --- a/drivers/media/usb/gspca/ov519.c +++ b/drivers/media/usb/gspca/ov519.c | |||
@@ -4762,7 +4762,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev, | |||
4762 | } | 4762 | } |
4763 | 4763 | ||
4764 | static int sd_set_jcomp(struct gspca_dev *gspca_dev, | 4764 | static int sd_set_jcomp(struct gspca_dev *gspca_dev, |
4765 | struct v4l2_jpegcompression *jcomp) | 4765 | const struct v4l2_jpegcompression *jcomp) |
4766 | { | 4766 | { |
4767 | struct sd *sd = (struct sd *) gspca_dev; | 4767 | struct sd *sd = (struct sd *) gspca_dev; |
4768 | 4768 | ||
diff --git a/drivers/media/usb/gspca/topro.c b/drivers/media/usb/gspca/topro.c index a6055246cb9d..4cb511ccc5f6 100644 --- a/drivers/media/usb/gspca/topro.c +++ b/drivers/media/usb/gspca/topro.c | |||
@@ -4806,7 +4806,7 @@ static void sd_set_streamparm(struct gspca_dev *gspca_dev, | |||
4806 | } | 4806 | } |
4807 | 4807 | ||
4808 | static int sd_set_jcomp(struct gspca_dev *gspca_dev, | 4808 | static int sd_set_jcomp(struct gspca_dev *gspca_dev, |
4809 | struct v4l2_jpegcompression *jcomp) | 4809 | const struct v4l2_jpegcompression *jcomp) |
4810 | { | 4810 | { |
4811 | struct sd *sd = (struct sd *) gspca_dev; | 4811 | struct sd *sd = (struct sd *) gspca_dev; |
4812 | 4812 | ||
diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c index c47ba14c7619..77c57755e7b4 100644 --- a/drivers/media/usb/gspca/zc3xx.c +++ b/drivers/media/usb/gspca/zc3xx.c | |||
@@ -6883,16 +6883,11 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
6883 | } | 6883 | } |
6884 | 6884 | ||
6885 | static int sd_set_jcomp(struct gspca_dev *gspca_dev, | 6885 | static int sd_set_jcomp(struct gspca_dev *gspca_dev, |
6886 | struct v4l2_jpegcompression *jcomp) | 6886 | const struct v4l2_jpegcompression *jcomp) |
6887 | { | 6887 | { |
6888 | struct sd *sd = (struct sd *) gspca_dev; | 6888 | struct sd *sd = (struct sd *) gspca_dev; |
6889 | int ret; | ||
6890 | 6889 | ||
6891 | ret = v4l2_ctrl_s_ctrl(sd->jpegqual, jcomp->quality); | 6890 | return v4l2_ctrl_s_ctrl(sd->jpegqual, jcomp->quality); |
6892 | if (ret) | ||
6893 | return ret; | ||
6894 | jcomp->quality = v4l2_ctrl_g_ctrl(sd->jpegqual); | ||
6895 | return 0; | ||
6896 | } | 6891 | } |
6897 | 6892 | ||
6898 | static int sd_get_jcomp(struct gspca_dev *gspca_dev, | 6893 | static int sd_get_jcomp(struct gspca_dev *gspca_dev, |
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c index a25513d484f7..2191f6ddf9e7 100644 --- a/drivers/media/usb/s2255/s2255drv.c +++ b/drivers/media/usb/s2255/s2255drv.c | |||
@@ -1556,7 +1556,7 @@ static int vidioc_g_jpegcomp(struct file *file, void *priv, | |||
1556 | } | 1556 | } |
1557 | 1557 | ||
1558 | static int vidioc_s_jpegcomp(struct file *file, void *priv, | 1558 | static int vidioc_s_jpegcomp(struct file *file, void *priv, |
1559 | struct v4l2_jpegcompression *jc) | 1559 | const struct v4l2_jpegcompression *jc) |
1560 | { | 1560 | { |
1561 | struct s2255_fh *fh = priv; | 1561 | struct s2255_fh *fh = priv; |
1562 | struct s2255_channel *channel = fh->channel; | 1562 | struct s2255_channel *channel = fh->channel; |