drm/edid: use for_each_displayid_db where applicable

Replace the duplicated versions of the while loop with the new macro.

Signed-off-by: Andres Rodriguez <andresx7@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190619183033.6922-1-andresx7@gmail.com

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index df635afe41b79acc389862204e7357158f609bc6..82a4ceed3fcf5a77bbb87b667b7c8375e9a19863 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4824,11 +4824,7 @@ static int add_displayid_detailed_modes(struct drm_connector *connector,
                return 0;
 
        idx += sizeof(struct displayid_hdr);
-       while (block = (struct displayid_block *)&displayid[idx],
-              idx + sizeof(struct displayid_block) <= length &&
-              idx + sizeof(struct displayid_block) + block->num_bytes <= length &&
-              block->num_bytes > 0) {
-               idx += block->num_bytes + sizeof(struct displayid_block);
+       for_each_displayid_db(displayid, block, idx, length) {
                switch (block->tag) {
                case DATA_BLOCK_TYPE_1_DETAILED_TIMING:
                        num_modes += add_displayid_detailed_1_modes(connector, block);
@@ -5445,11 +5441,7 @@ static int drm_parse_display_id(struct drm_connector *connector,
                return ret;
 
        idx += sizeof(struct displayid_hdr);
-       while (block = (struct displayid_block *)&displayid[idx],
-              idx + sizeof(struct displayid_block) <= length &&
-              idx + sizeof(struct displayid_block) + block->num_bytes <= length &&
-              block->num_bytes > 0) {
-               idx += block->num_bytes + sizeof(struct displayid_block);
+       for_each_displayid_db(displayid, block, idx, length) {
                DRM_DEBUG_KMS("block id 0x%x, rev %d, len %d\n",
                              block->tag, block->rev, block->num_bytes);