4 files changed, 31 insertions, 13 deletions

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index 580b74e2022b..90ee49786372 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/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/drivers/video/of_videomode.c b/drivers/video/of_videomode.c
index 5b8066cd397f..111c2d1911d3 100644
--- a/drivers/video/of_videomode.c
+++ b/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/drivers/video/videomode.c b/drivers/video/videomode.c
index a3d95f263cd5..df375c96c5d3 100644
--- a/drivers/video/videomode.c
+++ b/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/include/video/videomode.h b/include/video/videomode.h
index 8b12e60b6173..3f1049d870d5 100644
--- a/include/video/videomode.h
+++ b/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