diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-08-19 09:23:33 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-08-24 03:28:27 -0400 |
commit | 70b654945bacd27622ef1c424f054ae04de597e0 (patch) | |
tree | 4699e1b7a87ae0cb109bcae5f8bfb315160c3913 | |
parent | d1c65ad6a44b0ff79d2f0bf726fa6fd9248991f4 (diff) |
[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.c | 2 | ||||
-rw-r--r-- | drivers/media/i2c/ths8200.c | 2 | ||||
-rw-r--r-- | drivers/media/v4l2-core/v4l2-dv-timings.c | 10 | ||||
-rw-r--r-- | include/media/v4l2-dv-timings.h | 4 |
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, | |||
648 | v4l2_dbg(1, debug, sd, "%s:\n", __func__); | 648 | v4l2_dbg(1, debug, sd, "%s:\n", __func__); |
649 | 649 | ||
650 | /* quick sanity check */ | 650 | /* quick sanity check */ |
651 | if (!v4l2_dv_valid_timings(timings, &ad9389b_timings_cap)) | 651 | if (!v4l2_valid_dv_timings(timings, &ad9389b_timings_cap)) |
652 | return -EINVAL; | 652 | return -EINVAL; |
653 | 653 | ||
654 | /* Fill the optional fields .standards and .flags in struct v4l2_dv_timings | 654 | /* 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, | |||
378 | 378 | ||
379 | v4l2_dbg(1, debug, sd, "%s:\n", __func__); | 379 | v4l2_dbg(1, debug, sd, "%s:\n", __func__); |
380 | 380 | ||
381 | if (!v4l2_dv_valid_timings(timings, &ths8200_timings_cap)) | 381 | if (!v4l2_valid_dv_timings(timings, &ths8200_timings_cap)) |
382 | return -EINVAL; | 382 | return -EINVAL; |
383 | 383 | ||
384 | if (!v4l2_find_dv_timings_cap(timings, &ths8200_timings_cap, 10)) { | 384 | 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[] = { | |||
131 | }; | 131 | }; |
132 | EXPORT_SYMBOL_GPL(v4l2_dv_timings_presets); | 132 | EXPORT_SYMBOL_GPL(v4l2_dv_timings_presets); |
133 | 133 | ||
134 | bool v4l2_dv_valid_timings(const struct v4l2_dv_timings *t, | 134 | bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t, |
135 | const struct v4l2_dv_timings_cap *dvcap) | 135 | const struct v4l2_dv_timings_cap *dvcap) |
136 | { | 136 | { |
137 | const struct v4l2_bt_timings *bt = &t->bt; | 137 | const struct v4l2_bt_timings *bt = &t->bt; |
@@ -153,7 +153,7 @@ bool v4l2_dv_valid_timings(const struct v4l2_dv_timings *t, | |||
153 | return false; | 153 | return false; |
154 | return true; | 154 | return true; |
155 | } | 155 | } |
156 | EXPORT_SYMBOL_GPL(v4l2_dv_valid_timings); | 156 | EXPORT_SYMBOL_GPL(v4l2_valid_dv_timings); |
157 | 157 | ||
158 | int v4l2_enum_dv_timings_cap(struct v4l2_enum_dv_timings *t, | 158 | int v4l2_enum_dv_timings_cap(struct v4l2_enum_dv_timings *t, |
159 | const struct v4l2_dv_timings_cap *cap) | 159 | const struct v4l2_dv_timings_cap *cap) |
@@ -162,7 +162,7 @@ int v4l2_enum_dv_timings_cap(struct v4l2_enum_dv_timings *t, | |||
162 | 162 | ||
163 | memset(t->reserved, 0, sizeof(t->reserved)); | 163 | memset(t->reserved, 0, sizeof(t->reserved)); |
164 | for (i = idx = 0; v4l2_dv_timings_presets[i].bt.width; i++) { | 164 | for (i = idx = 0; v4l2_dv_timings_presets[i].bt.width; i++) { |
165 | if (v4l2_dv_valid_timings(v4l2_dv_timings_presets + i, cap) && | 165 | if (v4l2_valid_dv_timings(v4l2_dv_timings_presets + i, cap) && |
166 | idx++ == t->index) { | 166 | idx++ == t->index) { |
167 | t->timings = v4l2_dv_timings_presets[i]; | 167 | t->timings = v4l2_dv_timings_presets[i]; |
168 | return 0; | 168 | return 0; |
@@ -178,11 +178,11 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t, | |||
178 | { | 178 | { |
179 | int i; | 179 | int i; |
180 | 180 | ||
181 | if (!v4l2_dv_valid_timings(t, cap)) | 181 | if (!v4l2_valid_dv_timings(t, cap)) |
182 | return false; | 182 | return false; |
183 | 183 | ||
184 | for (i = 0; i < v4l2_dv_timings_presets[i].bt.width; i++) { | 184 | for (i = 0; i < v4l2_dv_timings_presets[i].bt.width; i++) { |
185 | if (v4l2_dv_valid_timings(v4l2_dv_timings_presets + i, cap) && | 185 | if (v4l2_valid_dv_timings(v4l2_dv_timings_presets + i, cap) && |
186 | v4l2_match_dv_timings(t, v4l2_dv_timings_presets + i, pclock_delta)) { | 186 | v4l2_match_dv_timings(t, v4l2_dv_timings_presets + i, pclock_delta)) { |
187 | *t = v4l2_dv_timings_presets[i]; | 187 | *t = v4l2_dv_timings_presets[i]; |
188 | return true; | 188 | 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 @@ | |||
27 | */ | 27 | */ |
28 | extern const struct v4l2_dv_timings v4l2_dv_timings_presets[]; | 28 | extern const struct v4l2_dv_timings v4l2_dv_timings_presets[]; |
29 | 29 | ||
30 | /** v4l2_dv_valid_timings() - are these timings valid? | 30 | /** v4l2_valid_dv_timings() - are these timings valid? |
31 | * @t: the v4l2_dv_timings struct. | 31 | * @t: the v4l2_dv_timings struct. |
32 | * @cap: the v4l2_dv_timings_cap capabilities. | 32 | * @cap: the v4l2_dv_timings_cap capabilities. |
33 | * | 33 | * |
34 | * Returns true if the given dv_timings struct is supported by the | 34 | * Returns true if the given dv_timings struct is supported by the |
35 | * hardware capabilities, returns false otherwise. | 35 | * hardware capabilities, returns false otherwise. |
36 | */ | 36 | */ |
37 | bool v4l2_dv_valid_timings(const struct v4l2_dv_timings *t, | 37 | bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t, |
38 | const struct v4l2_dv_timings_cap *cap); | 38 | const struct v4l2_dv_timings_cap *cap); |
39 | 39 | ||
40 | /** v4l2_enum_dv_timings_cap() - Helper function to enumerate possible DV timings based on capabilities | 40 | /** v4l2_enum_dv_timings_cap() - Helper function to enumerate possible DV timings based on capabilities |