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

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

[media] v4l2-dv-timings: rename v4l2_dv_valid_timings to v4l2_valid_dv_timings 



All other functions follow the v4l2_<foo>_dv_timings pattern, do the same for
this function.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent d1c65ad6

drivers/media/i2c/ad9389b.c

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ static int ad9389b_s_dv_timings(struct v4l2_subdev *sd, 
	v4l2_dbg(1, debug, sd, "%s:\n", __func__);



	/* quick sanity check */

	if (!v4l2_dv_valid_timings(timings, &ad9389b_timings_cap))

	if (!v4l2_valid_dv_timings(timings, &ad9389b_timings_cap))

		return -EINVAL;



	/* Fill the optional fields .standards and .flags in struct v4l2_dv_timings

drivers/media/i2c/ths8200.c

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static int ths8200_s_dv_timings(struct v4l2_subdev *sd, 


	v4l2_dbg(1, debug, sd, "%s:\n", __func__);



	if (!v4l2_dv_valid_timings(timings, &ths8200_timings_cap))

	if (!v4l2_valid_dv_timings(timings, &ths8200_timings_cap))

		return -EINVAL;



	if (!v4l2_find_dv_timings_cap(timings, &ths8200_timings_cap, 10)) {

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

+5 −5
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ const struct v4l2_dv_timings v4l2_dv_timings_presets[] = { 
};

EXPORT_SYMBOL_GPL(v4l2_dv_timings_presets);



bool v4l2_dv_valid_timings(const struct v4l2_dv_timings *t,

bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t,

			   const struct v4l2_dv_timings_cap *dvcap)

{

	const struct v4l2_bt_timings *bt = &t->bt;
@@ -153,7 +153,7 @@ bool v4l2_dv_valid_timings(const struct v4l2_dv_timings *t, 
		return false;

	return true;

}

EXPORT_SYMBOL_GPL(v4l2_dv_valid_timings);

EXPORT_SYMBOL_GPL(v4l2_valid_dv_timings);



int v4l2_enum_dv_timings_cap(struct v4l2_enum_dv_timings *t,

			     const struct v4l2_dv_timings_cap *cap)
@@ -162,7 +162,7 @@ int v4l2_enum_dv_timings_cap(struct v4l2_enum_dv_timings *t, 


	memset(t->reserved, 0, sizeof(t->reserved));

	for (i = idx = 0; v4l2_dv_timings_presets[i].bt.width; i++) {

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

		if (v4l2_valid_dv_timings(v4l2_dv_timings_presets + i, cap) &&

		    idx++ == t->index) {

			t->timings = v4l2_dv_timings_presets[i];

			return 0;
@@ -178,11 +178,11 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t, 
{

	int i;



	if (!v4l2_dv_valid_timings(t, cap))

	if (!v4l2_valid_dv_timings(t, cap))

		return false;



	for (i = 0; i < v4l2_dv_timings_presets[i].bt.width; i++) {

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

		if (v4l2_valid_dv_timings(v4l2_dv_timings_presets + i, cap) &&

		    v4l2_match_dv_timings(t, v4l2_dv_timings_presets + i, pclock_delta)) {

			*t = v4l2_dv_timings_presets[i];

			return true;

include/media/v4l2-dv-timings.h

+2 −2
Original line number Diff line number Diff line
@@ -27,14 +27,14 @@ 
 */

extern const struct v4l2_dv_timings v4l2_dv_timings_presets[];



/** v4l2_dv_valid_timings() - are these timings valid?

/** v4l2_valid_dv_timings() - are these timings valid?

  * @t:	  the v4l2_dv_timings struct.

  * @cap: the v4l2_dv_timings_cap capabilities.

  *

  * Returns true if the given dv_timings struct is supported by the

  * hardware capabilities, returns false otherwise.

  */

bool v4l2_dv_valid_timings(const struct v4l2_dv_timings *t,

bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t,

			   const struct v4l2_dv_timings_cap *cap);



/** v4l2_enum_dv_timings_cap() - Helper function to enumerate possible DV timings based on capabilities