video/hdmi: Rename HDMI_IDENTIFIER to HDMI_IEEE_OUI

HDMI_IDENTIFIER was felt too generic, rename it to what it is, the IEEE
OUI corresponding to HDMI Licensing, LLC.

http://standards.ieee.org/develop/regauth/oui/oui.txt

Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index ed3505fe8ace10644efa4eea990597a0a76b92d4..a207cc3f2c57630cfd8b019d3ae3fd769fbb029c 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2655,7 +2655,7 @@ static bool cea_db_is_hdmi_vsdb(const u8 *db)
 
        hdmi_id = db[1] | (db[2] << 8) | (db[3] << 16);
 
-       return hdmi_id == HDMI_IDENTIFIER;
+       return hdmi_id == HDMI_IEEE_OUI;
 }
 
 #define for_each_cea_db(cea, i, start, end) \

diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c
index 4f73167c8647e185fa75f351897e51450a88521f..9e758a8f890d3d84c58ea639e248d1bdff54ebf7 100644 (file)
--- a/drivers/video/hdmi.c
+++ b/drivers/video/hdmi.c
@@ -300,7 +300,7 @@ int hdmi_vendor_infoframe_init(struct hdmi_vendor_infoframe *frame)
        frame->type = HDMI_INFOFRAME_TYPE_VENDOR;
        frame->version = 1;
 
-       frame->oui = HDMI_IDENTIFIER;
+       frame->oui = HDMI_IEEE_OUI;
 
        /*
         * 0 is a valid value for s3d_struct, so we use a special "not set"
@@ -387,7 +387,7 @@ hdmi_vendor_any_infoframe_pack(union hdmi_vendor_any_infoframe *frame,
                           void *buffer, size_t size)
 {
        /* we only know about HDMI vendor infoframes */
-       if (frame->any.oui != HDMI_IDENTIFIER)
+       if (frame->any.oui != HDMI_IEEE_OUI)
                return -EINVAL;
 
        return hdmi_vendor_infoframe_pack(&frame->hdmi, buffer, size);

diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index d4ae12c7931bdfc26315a3c44070ea3236bbbfad..9231be9e90a2261d6ad6a12b3f49d25e39df7229 100644 (file)
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -18,7 +18,7 @@ enum hdmi_infoframe_type {
        HDMI_INFOFRAME_TYPE_AUDIO = 0x84,
 };
 
-#define HDMI_IDENTIFIER 0x000c03
+#define HDMI_IEEE_OUI 0x000c03
 #define HDMI_INFOFRAME_HEADER_SIZE  4
 #define HDMI_AVI_INFOFRAME_SIZE    13
 #define HDMI_SPD_INFOFRAME_SIZE    25