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

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

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 11d034c8

drivers/media/i2c/adv7604.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -763,7 +763,7 @@ static int find_and_set_predefined_video_timings(struct v4l2_subdev *sd, 
	int i;

	int i;





	for (i = 0; predef_vid_timings[i].timings.bt.width; 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))

					DIGITAL_INPUT ? 250000 : 1000000))

			continue;

			continue;

		io_write(sd, 0x00, predef_vid_timings[i].vid_std); /* video std */

		io_write(sd, 0x00, predef_vid_timings[i].vid_std); /* video std */
@@ -1183,7 +1183,7 @@ static void adv7604_fill_optional_dv_timings_fields(struct v4l2_subdev *sd, 
	int i;

	int i;





	for (i = 0; adv7604_timings[i].bt.width; 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)) {

					DIGITAL_INPUT ? 250000 : 1000000)) {

			*timings = adv7604_timings[i];

			*timings = adv7604_timings[i];

			break;

			break;

drivers/media/platform/s5p-tv/hdmi_drv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -625,7 +625,7 @@ static int hdmi_s_dv_timings(struct v4l2_subdev *sd, 
	int i;

	int i;





	for (i = 0; i < ARRAY_SIZE(hdmi_timings); 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))

					timings, 0))

			break;

			break;

	if (i == ARRAY_SIZE(hdmi_timings)) {

	if (i == ARRAY_SIZE(hdmi_timings)) {

drivers/media/usb/hdpvr/hdpvr-video.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -642,7 +642,7 @@ static int vidioc_s_dv_timings(struct file *file, void *_fh, 
	if (dev->status != STATUS_IDLE)

	if (dev->status != STATUS_IDLE)

		return -EBUSY;

		return -EBUSY;

	for (i = 0; i < ARRAY_SIZE(hdpvr_dv_timings); i++)

	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;

			break;

	if (i == ARRAY_SIZE(hdpvr_dv_timings))

	if (i == ARRAY_SIZE(hdpvr_dv_timings))

		return -EINVAL;

		return -EINVAL;

drivers/media/v4l2-core/v4l2-dv-timings.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -181,7 +181,7 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t, 




	for (i = 0; i < ARRAY_SIZE(timings); i++) {

	for (i = 0; i < ARRAY_SIZE(timings); i++) {

		if (v4l2_dv_valid_timings(timings + i, cap) &&

		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];

			*t = timings[i];

			return true;

			return true;

		}

		}
@@ -191,14 +191,14 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t, 
EXPORT_SYMBOL_GPL(v4l2_find_dv_timings_cap);

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...

 * @t1 - compare this v4l2_dv_timings struct...

 * @t2 - with this struct.

 * @t2 - with this struct.

 * @pclock_delta - the allowed pixelclock deviation.

 * @pclock_delta - the allowed pixelclock deviation.

 *

 *

 * Compare t1 with t2 with a given margin of error for the pixelclock.

 * Compare t1 with t2 with a given margin of error for the pixelclock.

 */

 */

bool v4l_match_dv_timings(const struct v4l2_dv_timings *t1,

bool v4l2_match_dv_timings(const struct v4l2_dv_timings *t1,

			   const struct v4l2_dv_timings *t2,

			   const struct v4l2_dv_timings *t2,

			   unsigned pclock_delta)

			   unsigned pclock_delta)

{

{
@@ -221,7 +221,7 @@ bool v4l_match_dv_timings(const struct v4l2_dv_timings *t1, 
		return true;

		return true;

	return false;

	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,

void v4l2_print_dv_timings(const char *dev_prefix, const char *prefix,

			   const struct v4l2_dv_timings *t, bool detailed)

			   const struct v4l2_dv_timings *t, bool detailed)

include/media/v4l2-dv-timings.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t, 
			      const struct v4l2_dv_timings_cap *cap,

			      const struct v4l2_dv_timings_cap *cap,

			      unsigned pclock_delta);

			      unsigned pclock_delta);





/** v4l_match_dv_timings() - do two timings match?

/** v4l2_match_dv_timings() - do two timings match?

  * @measured:	  the measured timings data.

  * @measured:	  the measured timings data.

  * @standard:	  the timings according to the standard.

  * @standard:	  the timings according to the standard.

  * @pclock_delta: maximum delta in Hz between standard->pixelclock and

  * @pclock_delta: maximum delta in Hz between standard->pixelclock and
@@ -72,7 +72,7 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t, 
  *

  *

  * Returns true if the two timings match, returns false otherwise.

  * Returns true if the two timings match, returns false otherwise.

  */

  */

bool v4l_match_dv_timings(const struct v4l2_dv_timings *measured,

bool v4l2_match_dv_timings(const struct v4l2_dv_timings *measured,

			   const struct v4l2_dv_timings *standard,

			   const struct v4l2_dv_timings *standard,

			   unsigned pclock_delta);

			   unsigned pclock_delta);