upstream: [media] v4l2-dv-timings: rename v4l_match_dv_timings to v4l2_match_dv_timings

It's the only function in v4l2-dv-timings.c with the v4l prefix instead
of v4l2. Make it consistent with the other functions.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index d7355de..09c440b 100644 (file)
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -765,7 +765,7 @@ static int find_and_set_predefined_video_timings(struct v4l2_subdev *sd,
        int i;
 
        for (i = 0; predef_vid_timings[i].timings.bt.width; i++) {
-               if (!v4l_match_dv_timings(timings, &predef_vid_timings[i].timings,
+               if (!v4l2_match_dv_timings(timings, &predef_vid_timings[i].timings,
                                        DIGITAL_INPUT ? 250000 : 1000000))
                        continue;
                io_write(sd, 0x00, predef_vid_timings[i].vid_std); /* video std */
@@ -1232,7 +1232,7 @@ static void adv7604_fill_optional_dv_timings_fields(struct v4l2_subdev *sd,
        int i;
 
        for (i = 0; adv7604_timings[i].bt.width; i++) {
-               if (v4l_match_dv_timings(timings, &adv7604_timings[i],
+               if (v4l2_match_dv_timings(timings, &adv7604_timings[i],
                                        DIGITAL_INPUT ? 250000 : 1000000)) {
                        *timings = adv7604_timings[i];
                        break;

diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c
index 20e13cd..b425eea 100644 (file)
--- a/drivers/media/platform/s5p-tv/hdmi_drv.c
+++ b/drivers/media/platform/s5p-tv/hdmi_drv.c
@@ -620,7 +620,7 @@ static int hdmi_s_dv_timings(struct v4l2_subdev *sd,
        int i;
 
        for (i = 0; i < ARRAY_SIZE(hdmi_timings); i++)
-               if (v4l_match_dv_timings(&hdmi_timings[i].dv_timings,
+               if (v4l2_match_dv_timings(&hdmi_timings[i].dv_timings,
                                        timings, 0))
                        break;
        if (i == ARRAY_SIZE(hdmi_timings)) {

diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
index 4e01058..6bce01a 100644 (file)
--- a/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -642,7 +642,7 @@ static int vidioc_s_dv_timings(struct file *file, void *_fh,
        if (dev->status != STATUS_IDLE)
                return -EBUSY;
        for (i = 0; i < ARRAY_SIZE(hdpvr_dv_timings); i++)
-               if (v4l_match_dv_timings(timings, hdpvr_dv_timings + i, 0))
+               if (v4l2_match_dv_timings(timings, hdpvr_dv_timings + i, 0))
                        break;
        if (i == ARRAY_SIZE(hdpvr_dv_timings))
                return -EINVAL;

diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c
index 917e58c..1a9d393 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-dv-timings.c
+++ b/drivers/media/v4l2-core/v4l2-dv-timings.c
@@ -181,7 +181,7 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t,
 
        for (i = 0; i < ARRAY_SIZE(timings); i++) {
                if (v4l2_dv_valid_timings(timings + i, cap) &&
-                   v4l_match_dv_timings(t, timings + i, pclock_delta)) {
+                   v4l2_match_dv_timings(t, timings + i, pclock_delta)) {
                        *t = timings[i];
                        return true;
                }
@@ -191,16 +191,16 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t,
 EXPORT_SYMBOL_GPL(v4l2_find_dv_timings_cap);
 
 /**
- * v4l_match_dv_timings - check if two timings match
+ * v4l2_match_dv_timings - check if two timings match
  * @t1 - compare this v4l2_dv_timings struct...
  * @t2 - with this struct.
  * @pclock_delta - the allowed pixelclock deviation.
  *
  * Compare t1 with t2 with a given margin of error for the pixelclock.
  */
-bool v4l_match_dv_timings(const struct v4l2_dv_timings *t1,
-                         const struct v4l2_dv_timings *t2,
-                         unsigned pclock_delta)
+bool v4l2_match_dv_timings(const struct v4l2_dv_timings *t1,
+                          const struct v4l2_dv_timings *t2,
+                          unsigned pclock_delta)
 {
        if (t1->type != t2->type || t1->type != V4L2_DV_BT_656_1120)
                return false;
@@ -221,7 +221,7 @@ bool v4l_match_dv_timings(const struct v4l2_dv_timings *t1,
                return true;
        return false;
 }
-EXPORT_SYMBOL_GPL(v4l_match_dv_timings);
+EXPORT_SYMBOL_GPL(v4l2_match_dv_timings);
 
 void v4l2_print_dv_timings(const char *dev_prefix, const char *prefix,
                           const struct v4l2_dv_timings *t, bool detailed)

diff --git a/include/media/v4l2-dv-timings.h b/include/media/v4l2-dv-timings.h
index 696e5c2..43f6b67 100644 (file)
--- a/include/media/v4l2-dv-timings.h
+++ b/include/media/v4l2-dv-timings.h
@@ -64,7 +64,7 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t,
                              const struct v4l2_dv_timings_cap *cap,
                              unsigned pclock_delta);
 
-/** v4l_match_dv_timings() - do two timings match?
+/** v4l2_match_dv_timings() - do two timings match?
   * @measured:   the measured timings data.
   * @standard:   the timings according to the standard.
   * @pclock_delta: maximum delta in Hz between standard->pixelclock and
@@ -72,9 +72,9 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t,
   *
   * Returns true if the two timings match, returns false otherwise.
   */
-bool v4l_match_dv_timings(const struct v4l2_dv_timings *measured,
-                         const struct v4l2_dv_timings *standard,
-                         unsigned pclock_delta);
+bool v4l2_match_dv_timings(const struct v4l2_dv_timings *measured,
+                          const struct v4l2_dv_timings *standard,
+                          unsigned pclock_delta);
 
 /** v4l2_print_dv_timings() - log the contents of a dv_timings struct
   * @dev_prefix:device prefix for each log line.