aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_edid.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-10-17 09:35:13 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-10-17 14:28:06 +0200
commita28187ccab9410cad20e8808f00cfc07f99649c3 (patch)
tree26ec95cc2626d2337a131344e4278571eb318e42 /drivers/gpu/drm/drm_edid.c
parentdrm/edid: Rename local variable block to edid (diff)
downloadlinux-dev-a28187ccab9410cad20e8808f00cfc07f99649c3.tar.xz
linux-dev-a28187ccab9410cad20e8808f00cfc07f99649c3.zip
drm/edid: Use block local to refer to the block
Now that we have the name "block" free once more, we can use it to point to the start of a block within the edid. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20161017083514.21772-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
-rw-r--r--drivers/gpu/drm/drm_edid.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 3b4ac28f509e..95de47ba1e77 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1313,15 +1313,13 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
edid = new;
for (j = 1; j <= edid[0x7e]; j++) {
+ u8 *block = edid + (valid_extensions + 1) * EDID_LENGTH;
+
for (i = 0; i < 4; i++) {
- if (get_edid_block(data,
- edid + (valid_extensions + 1) * EDID_LENGTH,
- j, EDID_LENGTH))
+ if (get_edid_block(data, block, j, EDID_LENGTH))
goto out;
- if (drm_edid_block_valid(edid + (valid_extensions + 1)
- * EDID_LENGTH, j,
- print_bad_edid,
- NULL)) {
+ if (drm_edid_block_valid(block, j,
+ print_bad_edid, NULL)) {
valid_extensions++;
break;
}