Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d88aab53 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e6eb28c2

drivers/media/pci/zoran/zoran_driver.c

+2 −2
Original line number Diff line number Diff line
@@ -2674,7 +2674,7 @@ static int zoran_g_jpegcomp(struct file *file, void *__fh, 
}



static int zoran_s_jpegcomp(struct file *file, void *__fh,

					struct v4l2_jpegcompression *params)

					const struct v4l2_jpegcompression *params)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;
@@ -2701,7 +2701,7 @@ static int zoran_s_jpegcomp(struct file *file, void *__fh, 
	if (!fh->buffers.allocated)

		fh->buffers.buffer_size =

			zoran_v4l2_calc_bufsize(&fh->jpg_settings);

	fh->jpg_settings.jpg_comp = *params = settings.jpg_comp;

	fh->jpg_settings.jpg_comp = settings.jpg_comp;

sjpegc_unlock_and_return:

	mutex_unlock(&zr->resource_lock);

drivers/media/usb/cpia2/cpia2_v4l.c

+2 −3
Original line number Diff line number Diff line
@@ -734,7 +734,8 @@ static int cpia2_g_jpegcomp(struct file *file, void *fh, struct v4l2_jpegcompres 
 *

 *****************************************************************************/



static int cpia2_s_jpegcomp(struct file *file, void *fh, struct v4l2_jpegcompression *parms)

static int cpia2_s_jpegcomp(struct file *file, void *fh,

		const struct v4l2_jpegcompression *parms)

{

	struct camera_data *cam = video_drvdata(file);
@@ -743,8 +744,6 @@ static int cpia2_s_jpegcomp(struct file *file, void *fh, struct v4l2_jpegcompres 


	cam->params.compression.inhibit_htables =

		!(parms->jpeg_markers & V4L2_JPEG_MARKER_DHT);

	parms->jpeg_markers &= V4L2_JPEG_MARKER_DQT | V4L2_JPEG_MARKER_DRI |

			       V4L2_JPEG_MARKER_DHT;



	if(parms->APP_len != 0) {

		if(parms->APP_len > 0 &&

drivers/media/usb/gspca/gspca.c

+1 −1
Original line number Diff line number Diff line
@@ -1686,7 +1686,7 @@ static int vidioc_g_jpegcomp(struct file *file, void *priv, 
}



static int vidioc_s_jpegcomp(struct file *file, void *priv,

			struct v4l2_jpegcompression *jpegcomp)

			const struct v4l2_jpegcompression *jpegcomp)

{

	struct gspca_dev *gspca_dev = video_drvdata(file);

drivers/media/usb/gspca/gspca.h

+5 −3
Original line number Diff line number Diff line
@@ -83,8 +83,10 @@ struct gspca_frame; 
typedef int (*cam_op) (struct gspca_dev *);

typedef void (*cam_v_op) (struct gspca_dev *);

typedef int (*cam_cf_op) (struct gspca_dev *, const struct usb_device_id *);

typedef int (*cam_jpg_op) (struct gspca_dev *,

typedef int (*cam_get_jpg_op) (struct gspca_dev *,

				struct v4l2_jpegcompression *);

typedef int (*cam_set_jpg_op) (struct gspca_dev *,

				const struct v4l2_jpegcompression *);

typedef int (*cam_reg_op) (struct gspca_dev *,

				struct v4l2_dbg_register *);

typedef int (*cam_ident_op) (struct gspca_dev *,
@@ -126,8 +128,8 @@ struct sd_desc { 
	cam_v_op stopN;		/* called on stream off - main alt */

	cam_v_op stop0;		/* called on stream off & disconnect - alt 0 */

	cam_v_op dq_callback;	/* called when a frame has been dequeued */

	cam_jpg_op get_jcomp;

	cam_jpg_op set_jcomp;

	cam_get_jpg_op get_jcomp;

	cam_set_jpg_op set_jcomp;

	cam_qmnu_op querymenu;

	cam_streamparm_op get_streamparm;

	cam_streamparm_op set_streamparm;

drivers/media/usb/gspca/jeilinj.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static int sd_init_controls(struct gspca_dev *gspca_dev) 
}



static int sd_set_jcomp(struct gspca_dev *gspca_dev,

			struct v4l2_jpegcompression *jcomp)

			const struct v4l2_jpegcompression *jcomp)

{

	struct sd *sd = (struct sd *) gspca_dev;