summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-08-19 15:23:33 +0200
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-08-24 09:28:27 +0200
commit70b654945bacd27622ef1c424f054ae04de597e0 (patch)
tree4699e1b7a87ae0cb109bcae5f8bfb315160c3913
parent[media] v4l2-dv-timings: export the timings list (diff)
downloadlinux-70b654945bacd27622ef1c424f054ae04de597e0.tar.xz
linux-70b654945bacd27622ef1c424f054ae04de597e0.zip
[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: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/i2c/ad9389b.c2
-rw-r--r--drivers/media/i2c/ths8200.c2
-rw-r--r--drivers/media/v4l2-core/v4l2-dv-timings.c10
-rw-r--r--include/media/v4l2-dv-timings.h4
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/i2c/ad9389b.c b/drivers/media/i2c/ad9389b.c
index bb74fb6b35c7..fc608516fc43 100644
--- a/drivers/media/i2c/ad9389b.c
+++ b/drivers/media/i2c/ad9389b.c
@@ -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
diff --git a/drivers/media/i2c/ths8200.c b/drivers/media/i2c/ths8200.c
index 580bd1b179fb..6abf0fb36079 100644
--- a/drivers/media/i2c/ths8200.c
+++ b/drivers/media/i2c/ths8200.c
@@ -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)) {
diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c
index f515997a7341..a77f20145881 100644
--- a/drivers/media/v4l2-core/v4l2-dv-timings.c
+++ b/drivers/media/v4l2-core/v4l2-dv-timings.c
@@ -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;
diff --git a/include/media/v4l2-dv-timings.h b/include/media/v4l2-dv-timings.h
index 0fe310b8bc80..bd59df8125c6 100644
--- a/include/media/v4l2-dv-timings.h
+++ b/include/media/v4l2-dv-timings.h
@@ -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