diff options
-rw-r--r-- | drivers/media/radio/radio-keene.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-si4713.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-wl1273.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/si4713-i2c.c | 4 | ||||
-rw-r--r-- | drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 | ||||
-rw-r--r-- | include/media/v4l2-ioctl.h | 2 | ||||
-rw-r--r-- | include/media/v4l2-subdev.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/radio/radio-keene.c b/drivers/media/radio/radio-keene.c index 79adf3e654e5..e10e525f33e5 100644 --- a/drivers/media/radio/radio-keene.c +++ b/drivers/media/radio/radio-keene.c | |||
@@ -203,7 +203,7 @@ static int vidioc_g_modulator(struct file *file, void *priv, | |||
203 | } | 203 | } |
204 | 204 | ||
205 | static int vidioc_s_modulator(struct file *file, void *priv, | 205 | static int vidioc_s_modulator(struct file *file, void *priv, |
206 | struct v4l2_modulator *v) | 206 | const struct v4l2_modulator *v) |
207 | { | 207 | { |
208 | struct keene_device *radio = video_drvdata(file); | 208 | struct keene_device *radio = video_drvdata(file); |
209 | 209 | ||
diff --git a/drivers/media/radio/radio-si4713.c b/drivers/media/radio/radio-si4713.c index 1e04101485a3..a082e400ed0f 100644 --- a/drivers/media/radio/radio-si4713.c +++ b/drivers/media/radio/radio-si4713.c | |||
@@ -200,7 +200,7 @@ static int radio_si4713_g_modulator(struct file *file, void *p, | |||
200 | } | 200 | } |
201 | 201 | ||
202 | static int radio_si4713_s_modulator(struct file *file, void *p, | 202 | static int radio_si4713_s_modulator(struct file *file, void *p, |
203 | struct v4l2_modulator *vm) | 203 | const struct v4l2_modulator *vm) |
204 | { | 204 | { |
205 | return v4l2_device_call_until_err(get_v4l2_dev(file), 0, tuner, | 205 | return v4l2_device_call_until_err(get_v4l2_dev(file), 0, tuner, |
206 | s_modulator, vm); | 206 | s_modulator, vm); |
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c index 2d93354fdcec..b53ecbc67f17 100644 --- a/drivers/media/radio/radio-wl1273.c +++ b/drivers/media/radio/radio-wl1273.c | |||
@@ -1715,7 +1715,7 @@ out: | |||
1715 | } | 1715 | } |
1716 | 1716 | ||
1717 | static int wl1273_fm_vidioc_s_modulator(struct file *file, void *priv, | 1717 | static int wl1273_fm_vidioc_s_modulator(struct file *file, void *priv, |
1718 | struct v4l2_modulator *modulator) | 1718 | const struct v4l2_modulator *modulator) |
1719 | { | 1719 | { |
1720 | struct wl1273_device *radio = video_get_drvdata(video_devdata(file)); | 1720 | struct wl1273_device *radio = video_get_drvdata(video_devdata(file)); |
1721 | struct wl1273_core *core = radio->core; | 1721 | struct wl1273_core *core = radio->core; |
diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c index b898c8925ab7..a9e6d17015ef 100644 --- a/drivers/media/radio/si4713-i2c.c +++ b/drivers/media/radio/si4713-i2c.c | |||
@@ -1213,7 +1213,7 @@ exit: | |||
1213 | } | 1213 | } |
1214 | 1214 | ||
1215 | static int si4713_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f); | 1215 | static int si4713_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f); |
1216 | static int si4713_s_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *); | 1216 | static int si4713_s_modulator(struct v4l2_subdev *sd, const struct v4l2_modulator *); |
1217 | /* | 1217 | /* |
1218 | * si4713_setup - Sets the device up with current configuration. | 1218 | * si4713_setup - Sets the device up with current configuration. |
1219 | * @sdev: si4713_device structure for the device we are communicating | 1219 | * @sdev: si4713_device structure for the device we are communicating |
@@ -1873,7 +1873,7 @@ exit: | |||
1873 | } | 1873 | } |
1874 | 1874 | ||
1875 | /* si4713_s_modulator - set modulator attributes */ | 1875 | /* si4713_s_modulator - set modulator attributes */ |
1876 | static int si4713_s_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm) | 1876 | static int si4713_s_modulator(struct v4l2_subdev *sd, const struct v4l2_modulator *vm) |
1877 | { | 1877 | { |
1878 | struct si4713_device *sdev = to_si4713_device(sd); | 1878 | struct si4713_device *sdev = to_si4713_device(sd); |
1879 | int rval = 0; | 1879 | int rval = 0; |
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c index 09585a99f02c..8a672a31a656 100644 --- a/drivers/media/radio/wl128x/fmdrv_v4l2.c +++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c | |||
@@ -448,7 +448,7 @@ static int fm_v4l2_vidioc_g_modulator(struct file *file, void *priv, | |||
448 | 448 | ||
449 | /* Set modulator attributes. If mode is not TX, set to TX. */ | 449 | /* Set modulator attributes. If mode is not TX, set to TX. */ |
450 | static int fm_v4l2_vidioc_s_modulator(struct file *file, void *priv, | 450 | static int fm_v4l2_vidioc_s_modulator(struct file *file, void *priv, |
451 | struct v4l2_modulator *mod) | 451 | const struct v4l2_modulator *mod) |
452 | { | 452 | { |
453 | struct fmdev *fmdev = video_drvdata(file); | 453 | struct fmdev *fmdev = video_drvdata(file); |
454 | u8 rds_mode; | 454 | u8 rds_mode; |
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h index d4c7729e8eca..fbeb00e2c109 100644 --- a/include/media/v4l2-ioctl.h +++ b/include/media/v4l2-ioctl.h | |||
@@ -179,7 +179,7 @@ struct v4l2_ioctl_ops { | |||
179 | int (*vidioc_g_modulator) (struct file *file, void *fh, | 179 | int (*vidioc_g_modulator) (struct file *file, void *fh, |
180 | struct v4l2_modulator *a); | 180 | struct v4l2_modulator *a); |
181 | int (*vidioc_s_modulator) (struct file *file, void *fh, | 181 | int (*vidioc_s_modulator) (struct file *file, void *fh, |
182 | struct v4l2_modulator *a); | 182 | const struct v4l2_modulator *a); |
183 | /* Crop ioctls */ | 183 | /* Crop ioctls */ |
184 | int (*vidioc_cropcap) (struct file *file, void *fh, | 184 | int (*vidioc_cropcap) (struct file *file, void *fh, |
185 | struct v4l2_cropcap *a); | 185 | struct v4l2_cropcap *a); |
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 22ab09e83808..e698f2cead4e 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h | |||
@@ -194,7 +194,7 @@ struct v4l2_subdev_tuner_ops { | |||
194 | int (*g_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt); | 194 | int (*g_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt); |
195 | int (*s_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt); | 195 | int (*s_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt); |
196 | int (*g_modulator)(struct v4l2_subdev *sd, struct v4l2_modulator *vm); | 196 | int (*g_modulator)(struct v4l2_subdev *sd, struct v4l2_modulator *vm); |
197 | int (*s_modulator)(struct v4l2_subdev *sd, struct v4l2_modulator *vm); | 197 | int (*s_modulator)(struct v4l2_subdev *sd, const struct v4l2_modulator *vm); |
198 | int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type); | 198 | int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type); |
199 | int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config); | 199 | int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config); |
200 | }; | 200 | }; |