drm/omap: remove set but not used variable 'frame_height'

Fixes gcc '-Wunused-but-set-variable' warning:

drivers/gpu/drm/omapdrm/dss/dispc.c: In function 'dispc_ovl_setup_common':
drivers/gpu/drm/omapdrm/dss/dispc.c:2627:19: warning:
 variable 'frame_height' set but not used [-Wunused-but-set-variable]

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index e61a9592a65081c3bc06fe456ac2157a2a28a492..7c23f23137e98afe6fa7da0702b3e8130c4930fd 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -2624,7 +2624,7 @@ static int dispc_ovl_setup_common(struct dispc_device *dispc,
        unsigned int offset0, offset1;
        s32 row_inc;
        s32 pix_inc;
-       u16 frame_width, frame_height;
+       u16 frame_width;
        unsigned int field_offset = 0;
        u16 in_height = height;
        u16 in_width = width;
@@ -2714,13 +2714,10 @@ static int dispc_ovl_setup_common(struct dispc_device *dispc,
        row_inc = 0;
        pix_inc = 0;
 
-       if (plane == OMAP_DSS_WB) {
+       if (plane == OMAP_DSS_WB)
                frame_width = out_width;
-               frame_height = out_height;
-       } else {
+       else
                frame_width = in_width;
-               frame_height = height;
-       }
 
        calc_offset(screen_width, frame_width,
                        fourcc, fieldmode, field_offset,