1 files changed, 15 insertions, 16 deletions

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index 96f0e7e7f889..13e32d02c884 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -24,7 +24,7 @@ struct panel_drv_data {
         int pd_gpio;
         int data_lines;
 
-        struct videomode timings;
+        struct videomode vm;
 };
 
 #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
@@ -81,7 +81,7 @@ static int tfp410_enable(struct omap_dss_device *dssdev)
         if (omapdss_device_is_enabled(dssdev))
                 return 0;
 
-        in->ops.dpi->set_timings(in, &ddata->timings);
+        in->ops.dpi->set_timings(in, &ddata->vm);
         if (ddata->data_lines)
                 in->ops.dpi->set_data_lines(in, ddata->data_lines);
 
@@ -113,44 +113,43 @@ static void tfp410_disable(struct omap_dss_device *dssdev)
         dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 }
 
-static void tfp410_fix_timings(struct videomode *timings)
+static void tfp410_fix_timings(struct videomode *vm)
 {
-        timings->flags |= DISPLAY_FLAGS_DE_HIGH |
-                          DISPLAY_FLAGS_PIXDATA_POSEDGE |
-                          DISPLAY_FLAGS_SYNC_POSEDGE;
+        vm->flags |= DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE |
+                     DISPLAY_FLAGS_SYNC_POSEDGE;
 }
 
 static void tfp410_set_timings(struct omap_dss_device *dssdev,
-                struct videomode *timings)
+                               struct videomode *vm)
 {
         struct panel_drv_data *ddata = to_panel_data(dssdev);
         struct omap_dss_device *in = ddata->in;
 
-        tfp410_fix_timings(timings);
+        tfp410_fix_timings(vm);
 
-        ddata->timings = *timings;
-        dssdev->panel.timings = *timings;
+        ddata->vm = *vm;
+        dssdev->panel.vm = *vm;
 
-        in->ops.dpi->set_timings(in, timings);
+        in->ops.dpi->set_timings(in, vm);
 }
 
 static void tfp410_get_timings(struct omap_dss_device *dssdev,
-                struct videomode *timings)
+                               struct videomode *vm)
 {
         struct panel_drv_data *ddata = to_panel_data(dssdev);
 
-        *timings = ddata->timings;
+        *vm = ddata->vm;
 }
 
 static int tfp410_check_timings(struct omap_dss_device *dssdev,
-                struct videomode *timings)
+                                struct videomode *vm)
 {
         struct panel_drv_data *ddata = to_panel_data(dssdev);
         struct omap_dss_device *in = ddata->in;
 
-        tfp410_fix_timings(timings);
+        tfp410_fix_timings(vm);
 
-        return in->ops.dpi->check_timings(in, timings);
+        return in->ops.dpi->check_timings(in, vm);
 }
 
 static const struct omapdss_dvi_ops tfp410_dvi_ops = {