Skip to content

Commit

Permalink
drm/displayid: rename displayid_hdr to displayid_header
Browse files Browse the repository at this point in the history
Avoid any confusion with High Dynamic Range. No functional changes.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ce083bd2789c7e22a91710726162287db88e3f6c.1617024940.git.jani.nikula@intel.com
  • Loading branch information
Jani Nikula committed Mar 31, 2021
1 parent f72b143 commit 339be1a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions drivers/gpu/drm/drm_displayid.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ static int validate_displayid(const u8 *displayid, int length, int idx)
{
int i, dispid_length;
u8 csum = 0;
const struct displayid_hdr *base;
const struct displayid_header *base;

base = (const struct displayid_hdr *)&displayid[idx];
base = (const struct displayid_header *)&displayid[idx];

DRM_DEBUG_KMS("base revision 0x%x, length %d, %d %d\n",
base->rev, base->bytes, base->prod_id, base->ext_count);
Expand All @@ -38,7 +38,7 @@ static const u8 *drm_find_displayid_extension(const struct edid *edid,
int *ext_index)
{
const u8 *displayid = drm_find_edid_extension(edid, DISPLAYID_EXT, ext_index);
const struct displayid_hdr *base;
const struct displayid_header *base;
int ret;

if (!displayid)
Expand All @@ -52,7 +52,7 @@ static const u8 *drm_find_displayid_extension(const struct edid *edid,
if (ret)
return NULL;

base = (const struct displayid_hdr *)&displayid[*idx];
base = (const struct displayid_header *)&displayid[*idx];
*length = *idx + sizeof(*base) + base->bytes;

return displayid;
Expand Down Expand Up @@ -118,7 +118,7 @@ __displayid_iter_next(struct displayid_iter *iter)
return NULL;
}

iter->idx += sizeof(struct displayid_hdr);
iter->idx += sizeof(struct displayid_header);

block = displayid_iter_block(iter);
if (block)
Expand Down
2 changes: 1 addition & 1 deletion include/drm/drm_displayid.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct edid;
#define PRODUCT_TYPE_REPEATER 5
#define PRODUCT_TYPE_DIRECT_DRIVE 6

struct displayid_hdr {
struct displayid_header {
u8 rev;
u8 bytes;
u8 prod_id;
Expand Down

0 comments on commit 339be1a

Please sign in to comment.