aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-08-15 07:28:47 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-08-24 03:26:51 -0400
commitef1ed8f5d366a035e532456bd747d34e5cb01ee5 (patch)
tree44dbe225248b063edbc20ecfd0534ea87a6b156c /drivers/media/v4l2-core
parent11d034c8b60c3eebc2a12f5e99a200f55a786230 (diff)
[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>
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r--drivers/media/v4l2-core/v4l2-dv-timings.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c
index 917e58ce1f18..1a9d393307a1 100644
--- 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,
181 181
182 for (i = 0; i < ARRAY_SIZE(timings); i++) { 182 for (i = 0; i < ARRAY_SIZE(timings); i++) {
183 if (v4l2_dv_valid_timings(timings + i, cap) && 183 if (v4l2_dv_valid_timings(timings + i, cap) &&
184 v4l_match_dv_timings(t, timings + i, pclock_delta)) { 184 v4l2_match_dv_timings(t, timings + i, pclock_delta)) {
185 *t = timings[i]; 185 *t = timings[i];
186 return true; 186 return true;
187 } 187 }
@@ -191,16 +191,16 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t,
191EXPORT_SYMBOL_GPL(v4l2_find_dv_timings_cap); 191EXPORT_SYMBOL_GPL(v4l2_find_dv_timings_cap);
192 192
193/** 193/**
194 * v4l_match_dv_timings - check if two timings match 194 * v4l2_match_dv_timings - check if two timings match
195 * @t1 - compare this v4l2_dv_timings struct... 195 * @t1 - compare this v4l2_dv_timings struct...
196 * @t2 - with this struct. 196 * @t2 - with this struct.
197 * @pclock_delta - the allowed pixelclock deviation. 197 * @pclock_delta - the allowed pixelclock deviation.
198 * 198 *
199 * Compare t1 with t2 with a given margin of error for the pixelclock. 199 * Compare t1 with t2 with a given margin of error for the pixelclock.
200 */ 200 */
201bool v4l_match_dv_timings(const struct v4l2_dv_timings *t1, 201bool v4l2_match_dv_timings(const struct v4l2_dv_timings *t1,
202 const struct v4l2_dv_timings *t2, 202 const struct v4l2_dv_timings *t2,
203 unsigned pclock_delta) 203 unsigned pclock_delta)
204{ 204{
205 if (t1->type != t2->type || t1->type != V4L2_DV_BT_656_1120) 205 if (t1->type != t2->type || t1->type != V4L2_DV_BT_656_1120)
206 return false; 206 return false;
@@ -221,7 +221,7 @@ bool v4l_match_dv_timings(const struct v4l2_dv_timings *t1,
221 return true; 221 return true;
222 return false; 222 return false;
223} 223}
224EXPORT_SYMBOL_GPL(v4l_match_dv_timings); 224EXPORT_SYMBOL_GPL(v4l2_match_dv_timings);
225 225
226void v4l2_print_dv_timings(const char *dev_prefix, const char *prefix, 226void v4l2_print_dv_timings(const char *dev_prefix, const char *prefix,
227 const struct v4l2_dv_timings *t, bool detailed) 227 const struct v4l2_dv_timings *t, bool detailed)