1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 35d388b6aec1..56e23040df08 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -705,7 +705,8 @@ static void dispc_ovl_set_pos(enum omap_plane plane, int x, int y)
         dispc_write_reg(DISPC_OVL_POSITION(plane), val);
 }
 
-static void dispc_ovl_set_pic_size(enum omap_plane plane, int width, int height)
+static void dispc_ovl_set_input_size(enum omap_plane plane, int width,
+                int height)
 {
         u32 val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0);
 
@@ -715,7 +716,8 @@ static void dispc_ovl_set_pic_size(enum omap_plane plane, int width, int height)
                 dispc_write_reg(DISPC_OVL_PICTURE_SIZE(plane), val);
 }
 
-static void dispc_ovl_set_vid_size(enum omap_plane plane, int width, int height)
+static void dispc_ovl_set_output_size(enum omap_plane plane, int width,
+                int height)
 {
         u32 val;
 
@@ -2387,13 +2389,14 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi,
 
         dispc_ovl_set_pos(plane, oi->pos_x, pos_y);
 
-        dispc_ovl_set_pic_size(plane, in_width, in_height);
+        dispc_ovl_set_input_size(plane, in_width, in_height);
 
         if (ovl->caps & OMAP_DSS_OVL_CAP_SCALE) {
                 dispc_ovl_set_scaling(plane, in_width, in_height, out_width,
                                    out_height, ilace, five_taps, fieldmode,
                                    oi->color_mode, oi->rotation);
-                dispc_ovl_set_vid_size(plane, out_width, out_height);
+
+                dispc_ovl_set_output_size(plane, out_width, out_height);
                 dispc_ovl_set_vid_color_conv(plane, cconv);
         }