From 5c7d523b712db6cb9d3004b53661d3e5de06137c Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Thu, 21 Mar 2013 14:20:12 +0200
Subject: [PATCH] --- yaml --- r: 362937 b: refs/heads/master c:
 6cd2c7db41eab204b6474534df4ca68a7dc53d86 h: refs/heads/master i:   362935:
 012ab0cf52502faf1618ef02e4530325a24ecb59 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/gpu/drm/tilcdc/tilcdc_panel.c |  2 +-
 trunk/drivers/video/of_videomode.c          |  2 +-
 trunk/drivers/video/videomode.c             | 25 +++++++++++++--------
 trunk/include/video/videomode.h             | 15 +++++++++++--
 5 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index be83833d7b00..7011fd5e6b71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 694f050650798b82f2c7b9983e80117d58b34bf3
+refs/heads/master: 6cd2c7db41eab204b6474534df4ca68a7dc53d86
diff --git a/trunk/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/trunk/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index 580b74e2022b..90ee49786372 100644
--- a/trunk/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/trunk/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -173,7 +173,7 @@ static int panel_connector_get_modes(struct drm_connector *connector)
 		struct drm_display_mode *mode = drm_mode_create(dev);
 		struct videomode vm;
 
-		if (videomode_from_timing(timings, &vm, i))
+		if (videomode_from_timings(timings, &vm, i))
 			break;
 
 		drm_display_mode_from_videomode(&vm, mode);
diff --git a/trunk/drivers/video/of_videomode.c b/trunk/drivers/video/of_videomode.c
index 5b8066cd397f..111c2d1911d3 100644
--- a/trunk/drivers/video/of_videomode.c
+++ b/trunk/drivers/video/of_videomode.c
@@ -43,7 +43,7 @@ int of_get_videomode(struct device_node *np, struct videomode *vm,
 	if (index == OF_USE_NATIVE_MODE)
 		index = disp->native_mode;
 
-	ret = videomode_from_timing(disp, vm, index);
+	ret = videomode_from_timings(disp, vm, index);
 	if (ret)
 		return ret;
 
diff --git a/trunk/drivers/video/videomode.c b/trunk/drivers/video/videomode.c
index a3d95f263cd5..df375c96c5d3 100644
--- a/trunk/drivers/video/videomode.c
+++ b/trunk/drivers/video/videomode.c
@@ -11,15 +11,9 @@
 #include <video/display_timing.h>
 #include <video/videomode.h>
 
-int videomode_from_timing(const struct display_timings *disp,
-			  struct videomode *vm, unsigned int index)
+void videomode_from_timing(const struct display_timing *dt,
+			  struct videomode *vm)
 {
-	struct display_timing *dt;
-
-	dt = display_timings_get(disp, index);
-	if (!dt)
-		return -EINVAL;
-
 	vm->pixelclock = dt->pixelclock.typ;
 	vm->hactive = dt->hactive.typ;
 	vm->hfront_porch = dt->hfront_porch.typ;
@@ -32,7 +26,20 @@ int videomode_from_timing(const struct display_timings *disp,
 	vm->vsync_len = dt->vsync_len.typ;
 
 	vm->flags = dt->flags;
+}
+EXPORT_SYMBOL_GPL(videomode_from_timing);
+
+int videomode_from_timings(const struct display_timings *disp,
+			  struct videomode *vm, unsigned int index)
+{
+	struct display_timing *dt;
+
+	dt = display_timings_get(disp, index);
+	if (!dt)
+		return -EINVAL;
+
+	videomode_from_timing(dt, vm);
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(videomode_from_timing);
+EXPORT_SYMBOL_GPL(videomode_from_timings);
diff --git a/trunk/include/video/videomode.h b/trunk/include/video/videomode.h
index 8b12e60b6173..3f1049d870d5 100644
--- a/trunk/include/video/videomode.h
+++ b/trunk/include/video/videomode.h
@@ -34,14 +34,25 @@ struct videomode {
 
 /**
  * videomode_from_timing - convert display timing to videomode
+ * @dt: display_timing structure
+ * @vm: return value
+ *
+ * DESCRIPTION:
+ * This function converts a struct display_timing to a struct videomode.
+ */
+void videomode_from_timing(const struct display_timing *dt,
+			  struct videomode *vm);
+
+/**
+ * videomode_from_timings - convert one display timings entry to videomode
  * @disp: structure with all possible timing entries
  * @vm: return value
  * @index: index into the list of display timings in devicetree
  *
  * DESCRIPTION:
- * This function converts a struct display_timing to a struct videomode.
+ * This function converts one struct display_timing entry to a struct videomode.
  */
-int videomode_from_timing(const struct display_timings *disp,
+int videomode_from_timings(const struct display_timings *disp,
 			  struct videomode *vm, unsigned int index);
 
 #endif