Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[cascardo/linux.git] / drivers / gpu / drm / drm_edid.c

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 6ac4055..96e9631 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -753,13 +753,11 @@ drm_mode_do_interlace_quirk(struct drm_display_mode *mode,
                { 1440,  576 },
                { 2880,  576 },
        };
-       static const int n_sizes =
-               sizeof(cea_interlaced)/sizeof(cea_interlaced[0]);
 
        if (!(pt->misc & DRM_EDID_PT_INTERLACED))
                return;
 
-       for (i = 0; i < n_sizes; i++) {
+       for (i = 0; i < ARRAY_SIZE(cea_interlaced); i++) {
                if ((mode->hdisplay == cea_interlaced[i].w) &&
                    (mode->vdisplay == cea_interlaced[i].h / 2)) {
                        mode->vdisplay *= 2;
@@ -1019,7 +1017,7 @@ drm_est3_modes(struct drm_connector *connector, struct detailed_timing *timing)
        for (i = 0; i < 6; i++) {
                for (j = 7; j > 0; j--) {
                        m = (i * 8) + (7 - j);
-                       if (m >= num_est3_modes)
+                       if (m >= ARRAY_SIZE(est3_modes))
                                break;
                        if (est[i] & (1 << j)) {
                                mode = drm_mode_find_dmt(connector->dev,