[media] v4l2: add const to argument of write-only s_frequency ioctl

This ioctl is defined as IOW, so pass the argument as const.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

17 files changed, 49 insertions, 51 deletions

diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 63b112b555b2..e140a725820d 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -214,7 +214,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 }
 
 static int vidioc_s_frequency(struct file *file, void *priv,
-                                struct v4l2_frequency *f)
+                                const struct v4l2_frequency *f)
 {
         struct dsbr100_device *radio = video_drvdata(file);
 
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 643d80ac28fb..59be293cbf42 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -90,6 +90,26 @@ static u16 sigtable[2][4] = {
         { 2185, 4369, 13107, 65535 },
 };
 
+static const struct v4l2_frequency_band bands[] = {
+        {
+                .index = 0,
+                .type = V4L2_TUNER_RADIO,
+                .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_FREQ_BANDS,
+                .rangelow = 8320,      /* 520 kHz */
+                .rangehigh = 26400,    /* 1650 kHz */
+                .modulation = V4L2_BAND_MODULATION_AM,
+        }, {
+                .index = 1,
+                .type = V4L2_TUNER_RADIO,
+                .capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS |
+                        V4L2_TUNER_CAP_RDS_BLOCK_IO | V4L2_TUNER_CAP_LOW |
+                        V4L2_TUNER_CAP_FREQ_BANDS,
+                .rangelow = 1400000,   /* 87.5 MHz */
+                .rangehigh = 1728000,  /* 108.0 MHz */
+                .modulation = V4L2_BAND_MODULATION_FM,
+        },
+};
+
 
 static int cadet_getstereo(struct cadet *dev)
 {
@@ -196,6 +216,8 @@ static void cadet_setfreq(struct cadet *dev, unsigned freq)
         int i, j, test;
         int curvol;
 
+        freq = clamp(freq, bands[dev->is_fm_band].rangelow,
+                           bands[dev->is_fm_band].rangehigh);
         dev->curfreq = freq;
         /*
          * Formulate a fifo command
@@ -337,26 +359,6 @@ static int vidioc_querycap(struct file *file, void *priv,
         return 0;
 }
 
-static const struct v4l2_frequency_band bands[] = {
-        {
-                .index = 0,
-                .type = V4L2_TUNER_RADIO,
-                .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_FREQ_BANDS,
-                .rangelow = 8320,      /* 520 kHz */
-                .rangehigh = 26400,    /* 1650 kHz */
-                .modulation = V4L2_BAND_MODULATION_AM,
-        }, {
-                .index = 1,
-                .type = V4L2_TUNER_RADIO,
-                .capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS |
-                        V4L2_TUNER_CAP_RDS_BLOCK_IO | V4L2_TUNER_CAP_LOW |
-                        V4L2_TUNER_CAP_FREQ_BANDS,
-                .rangelow = 1400000,   /* 87.5 MHz */
-                .rangehigh = 1728000,  /* 108.0 MHz */
-                .modulation = V4L2_BAND_MODULATION_FM,
-        },
-};
-
 static int vidioc_g_tuner(struct file *file, void *priv,
                                 struct v4l2_tuner *v)
 {
@@ -418,7 +420,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 
 
 static int vidioc_s_frequency(struct file *file, void *priv,
-                                struct v4l2_frequency *f)
+                                const struct v4l2_frequency *f)
 {
         struct cadet *dev = video_drvdata(file);
 
@@ -426,8 +428,6 @@ static int vidioc_s_frequency(struct file *file, void *priv,
                 return -EINVAL;
         dev->is_fm_band =
                 f->frequency >= (bands[0].rangehigh + bands[1].rangelow) / 2;
-        clamp(f->frequency, bands[dev->is_fm_band].rangelow,
-                            bands[dev->is_fm_band].rangehigh);
         cadet_setfreq(dev, f->frequency);
         return 0;
 }
diff --git a/drivers/media/radio/radio-isa.c b/drivers/media/radio/radio-isa.c
index fe0a4f85c422..0c1e27b13e69 100644
--- a/drivers/media/radio/radio-isa.c
+++ b/drivers/media/radio/radio-isa.c
@@ -102,17 +102,18 @@ static int radio_isa_s_tuner(struct file *file, void *priv,
 }
 
 static int radio_isa_s_frequency(struct file *file, void *priv,
-                                struct v4l2_frequency *f)
+                                const struct v4l2_frequency *f)
 {
         struct radio_isa_card *isa = video_drvdata(file);
+        u32 freq = f->frequency;
         int res;
 
         if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
                 return -EINVAL;
-        f->frequency = clamp(f->frequency, FREQ_LOW, FREQ_HIGH);
-        res = isa->drv->ops->s_frequency(isa, f->frequency);
+        freq = clamp(freq, FREQ_LOW, FREQ_HIGH);
+        res = isa->drv->ops->s_frequency(isa, freq);
         if (res == 0)
-                isa->freq = f->frequency;
+                isa->freq = freq;
         return res;
 }
 
diff --git a/drivers/media/radio/radio-keene.c b/drivers/media/radio/radio-keene.c
index 296941a9ae25..4c9ae767fb31 100644
--- a/drivers/media/radio/radio-keene.c
+++ b/drivers/media/radio/radio-keene.c
@@ -215,15 +215,15 @@ static int vidioc_s_modulator(struct file *file, void *priv,
 }
 
 static int vidioc_s_frequency(struct file *file, void *priv,
-                                struct v4l2_frequency *f)
+                                const struct v4l2_frequency *f)
 {
         struct keene_device *radio = video_drvdata(file);
+        unsigned freq = f->frequency;
 
         if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
                 return -EINVAL;
-        f->frequency = clamp(f->frequency,
-                        FREQ_MIN * FREQ_MUL, FREQ_MAX * FREQ_MUL);
-        return keene_cmd_main(radio, f->frequency, true);
+        freq = clamp(freq, FREQ_MIN * FREQ_MUL, FREQ_MAX * FREQ_MUL);
+        return keene_cmd_main(radio, freq, true);
 }
 
 static int vidioc_g_frequency(struct file *file, void *priv,
diff --git a/drivers/media/radio/radio-ma901.c b/drivers/media/radio/radio-ma901.c
index c61f590029ad..7f85c6f98009 100644
--- a/drivers/media/radio/radio-ma901.c
+++ b/drivers/media/radio/radio-ma901.c
@@ -257,7 +257,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 
 /* vidioc_s_frequency - set tuner radio frequency */
 static int vidioc_s_frequency(struct file *file, void *priv,
-                                struct v4l2_frequency *f)
+                                const struct v4l2_frequency *f)
 {
         struct ma901radio_device *radio = video_drvdata(file);
 
diff --git a/drivers/media/radio/radio-miropcm20.c b/drivers/media/radio/radio-miropcm20.c
index 3d0ff4404d12..2b8d31d8330b 100644
--- a/drivers/media/radio/radio-miropcm20.c
+++ b/drivers/media/radio/radio-miropcm20.c
@@ -131,14 +131,14 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 
 
 static int vidioc_s_frequency(struct file *file, void *priv,
-                                struct v4l2_frequency *f)
+                                const struct v4l2_frequency *f)
 {
         struct pcm20 *dev = video_drvdata(file);
 
         if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
                 return -EINVAL;
 
-        dev->freq = clamp(f->frequency, 87 * 16000U, 108 * 16000U);
+        dev->freq = clamp_t(u32, f->frequency, 87 * 16000U, 108 * 16000U);
         pcm20_setfreq(dev, dev->freq);
         return 0;
 }
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index 9c5a267b60b4..f9cdd8b96add 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -323,7 +323,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 
 /* vidioc_s_frequency - set tuner radio frequency */
 static int vidioc_s_frequency(struct file *file, void *priv,
-                                struct v4l2_frequency *f)
+                                const struct v4l2_frequency *f)
 {
         struct amradio_device *radio = video_drvdata(file);
 
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 637a55564958..6142b5b3e81b 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -151,7 +151,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 }
 
 static int vidioc_s_frequency(struct file *file, void *priv,
-                                        struct v4l2_frequency *f)
+                                        const struct v4l2_frequency *f)
 {
         struct fmi *fmi = video_drvdata(file);
 
diff --git a/drivers/media/radio/radio-si4713.c b/drivers/media/radio/radio-si4713.c
index 3df4339460d2..2a2d21ed9133 100644
--- a/drivers/media/radio/radio-si4713.c
+++ b/drivers/media/radio/radio-si4713.c
@@ -215,7 +215,7 @@ static int radio_si4713_g_frequency(struct file *file, void *p,
 }
 
 static int radio_si4713_s_frequency(struct file *file, void *p,
-                                    struct v4l2_frequency *vf)
+                                    const struct v4l2_frequency *vf)
 {
         return v4l2_device_call_until_err(get_v4l2_dev(file), 0, tuner,
                                           s_frequency, vf);
diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index 1978516af67e..893842874d89 100644
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -351,7 +351,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 }
 
 static int vidioc_s_frequency(struct file *file, void *priv,
-                                struct v4l2_frequency *f)
+                                const struct v4l2_frequency *f)
 {
         struct tea5764_device *radio = video_drvdata(file);
 
diff --git a/drivers/media/radio/radio-tea5777.c b/drivers/media/radio/radio-tea5777.c
index 4b5190d4fea5..fcd7c195e0c5 100644
--- a/drivers/media/radio/radio-tea5777.c
+++ b/drivers/media/radio/radio-tea5777.c
@@ -368,7 +368,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 }
 
 static int vidioc_s_frequency(struct file *file, void *priv,
-                                        struct v4l2_frequency *f)
+                                        const struct v4l2_frequency *f)
 {
         struct radio_tea5777 *tea = video_drvdata(file);
 
diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c
index b87effeb5dc6..1712c05c113d 100644
--- a/drivers/media/radio/radio-timb.c
+++ b/drivers/media/radio/radio-timb.c
@@ -91,7 +91,7 @@ static int timbradio_vidioc_s_audio(struct file *file, void *priv,
 }
 
 static int timbradio_vidioc_s_frequency(struct file *file, void *priv,
-        struct v4l2_frequency *f)
+        const struct v4l2_frequency *f)
 {
         struct timbradio *tr = video_drvdata(file);
         return v4l2_subdev_call(tr->sd_tuner, tuner, s_frequency, f);
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index 02151e0e6e63..9a02fee904bf 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -1640,7 +1640,7 @@ static int wl1273_fm_vidioc_g_frequency(struct file *file, void *priv,
 }
 
 static int wl1273_fm_vidioc_s_frequency(struct file *file, void *priv,
-                                        struct v4l2_frequency *freq)
+                                        const struct v4l2_frequency *freq)
 {
         struct wl1273_device *radio = video_get_drvdata(video_devdata(file));
         struct wl1273_core *core = radio->core;
diff --git a/drivers/media/radio/si470x/radio-si470x-common.c b/drivers/media/radio/si470x/radio-si470x-common.c
index 18989388ddc1..5708633a3d78 100644
--- a/drivers/media/radio/si470x/radio-si470x-common.c
+++ b/drivers/media/radio/si470x/radio-si470x-common.c
@@ -678,7 +678,7 @@ static int si470x_vidioc_g_frequency(struct file *file, void *priv,
  * si470x_vidioc_s_frequency - set tuner or modulator radio frequency
  */
 static int si470x_vidioc_s_frequency(struct file *file, void *priv,
-                struct v4l2_frequency *freq)
+                const struct v4l2_frequency *freq)
 {
         struct si470x_device *radio = video_drvdata(file);
         int retval;
diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
index bd61b3bd0ca3..e305c14272b5 100644
--- a/drivers/media/radio/si4713-i2c.c
+++ b/drivers/media/radio/si4713-i2c.c
@@ -1212,7 +1212,7 @@ exit:
         return rval;
 }
 
-static int si4713_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f);
+static int si4713_s_frequency(struct v4l2_subdev *sd, const struct v4l2_frequency *f);
 static int si4713_s_modulator(struct v4l2_subdev *sd, const struct v4l2_modulator *);
 /*
  * si4713_setup - Sets the device up with current configuration.
@@ -1950,7 +1950,7 @@ unlock:
 }
 
 /* si4713_s_frequency - set tuner or modulator radio frequency */
-static int si4713_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f)
+static int si4713_s_frequency(struct v4l2_subdev *sd, const struct v4l2_frequency *f)
 {
         struct si4713_device *sdev = to_si4713_device(sd);
         int rval = 0;
@@ -1970,7 +1970,6 @@ static int si4713_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f)
                 rval = 0;
         }
         sdev->frequency = frequency;
-        f->frequency = si4713_to_v4l2(frequency);
 
 unlock:
         mutex_unlock(&sdev->mutex);
diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c
index b18c2dc268ba..867395568f92 100644
--- a/drivers/media/radio/tef6862.c
+++ b/drivers/media/radio/tef6862.c
@@ -101,7 +101,7 @@ static int tef6862_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *v)
         return v->index ? -EINVAL : 0;
 }
 
-static int tef6862_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f)
+static int tef6862_s_frequency(struct v4l2_subdev *sd, const struct v4l2_frequency *f)
 {
         struct tef6862_state *state = to_state(sd);
         struct i2c_client *client = v4l2_get_subdevdata(sd);
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c
index 0a8ee8fab924..0183956d9b02 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.c
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c
@@ -388,7 +388,7 @@ static int fm_v4l2_vidioc_g_freq(struct file *file, void *priv,
 
 /* Set tuner or modulator radio frequency */
 static int fm_v4l2_vidioc_s_freq(struct file *file, void *priv,
-                struct v4l2_frequency *freq)
+                const struct v4l2_frequency *freq)
 {
         struct fmdev *fmdev = video_drvdata(file);
 
@@ -396,9 +396,7 @@ static int fm_v4l2_vidioc_s_freq(struct file *file, void *priv,
          * As V4L2_TUNER_CAP_LOW is set 1 user sends the frequency
          * in units of 62.5 Hz.
          */
-        freq->frequency = (u32)(freq->frequency / 16);
-
-        return fmc_set_freq(fmdev, freq->frequency);
+        return fmc_set_freq(fmdev, freq->frequency / 16);
 }
 
 /* Set hardware frequency seek. If current mode is NOT RX, set it RX. */