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

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

[media] v4l2: make vidioc_s_modulator const 



Write-only ioctls should have a const argument in the ioctl op.
Do this conversion for vidioc_s_modulator.
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 ba9425bc

drivers/media/radio/radio-keene.c

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



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

				struct v4l2_modulator *v)

				const struct v4l2_modulator *v)

{

	struct keene_device *radio = video_drvdata(file);

drivers/media/radio/radio-si4713.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int radio_si4713_g_modulator(struct file *file, void *p, 
}



static int radio_si4713_s_modulator(struct file *file, void *p,

						struct v4l2_modulator *vm)

						const struct v4l2_modulator *vm)

{

	return v4l2_device_call_until_err(get_v4l2_dev(file), 0, tuner,

							s_modulator, vm);

drivers/media/radio/radio-wl1273.c

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



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

					struct v4l2_modulator *modulator)

					const struct v4l2_modulator *modulator)

{

	struct wl1273_device *radio = video_get_drvdata(video_devdata(file));

	struct wl1273_core *core = radio->core;

drivers/media/radio/si4713-i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ static int si4713_write_econtrol_integers(struct si4713_device *sdev, 
}



static int si4713_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f);

static int si4713_s_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *);

static int si4713_s_modulator(struct v4l2_subdev *sd, const struct v4l2_modulator *);

/*

 * si4713_setup - Sets the device up with current configuration.

 * @sdev: si4713_device structure for the device we are communicating
@@ -1873,7 +1873,7 @@ static int si4713_g_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm) 
}



/* si4713_s_modulator - set modulator attributes */

static int si4713_s_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm)

static int si4713_s_modulator(struct v4l2_subdev *sd, const struct v4l2_modulator *vm)

{

	struct si4713_device *sdev = to_si4713_device(sd);

	int rval = 0;

drivers/media/radio/wl128x/fmdrv_v4l2.c

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static int fm_v4l2_vidioc_g_modulator(struct file *file, void *priv, 


/* Set modulator attributes. If mode is not TX, set to TX. */

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

		struct v4l2_modulator *mod)

		const struct v4l2_modulator *mod)

{

	struct fmdev *fmdev = video_drvdata(file);

	u8 rds_mode;