diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-10-10 17:51:24 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-10-18 17:04:35 +0300 |
| commit | 67fdd8ea53195ee265cf4b8bf5498a549cebcd71 (patch) | |
| tree | 7bf39bd5430263afb7b0888ef1c26ea15df71545 | |
| parent | 2edb3de9e599e79db4028335df2a64f3ad014b2a (diff) | |
| download | linux-67fdd8ea53195ee265cf4b8bf5498a549cebcd71.tar.xz | |
drm/i915: s/hdcp2_hdmi_msg_data/hdcp2_hdmi_msg_timeout/
The array is there only for timeout, "data" doesn't mean anything
so let's rename the thing to be more descriptive.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191010145127.7487-2-ville.syrjala@linux.intel.com
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_hdmi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 92d1cbbbee2b..f779f60a1160 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -1535,13 +1535,13 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port) return true; } -struct hdcp2_hdmi_msg_data { +struct hdcp2_hdmi_msg_timeout { u8 msg_id; u32 timeout; u32 timeout2; }; -static const struct hdcp2_hdmi_msg_data hdcp2_msg_data[] = { +static const struct hdcp2_hdmi_msg_timeout hdcp2_msg_timeout[] = { { HDCP_2_2_AKE_INIT, 0, 0 }, { HDCP_2_2_AKE_SEND_CERT, HDCP_2_2_CERT_TIMEOUT_MS, 0 }, { HDCP_2_2_AKE_NO_STORED_KM, 0, 0 }, @@ -1572,12 +1572,12 @@ static int get_hdcp2_msg_timeout(u8 msg_id, bool is_paired) { int i; - for (i = 0; i < ARRAY_SIZE(hdcp2_msg_data); i++) - if (hdcp2_msg_data[i].msg_id == msg_id && + for (i = 0; i < ARRAY_SIZE(hdcp2_msg_timeout); i++) + if (hdcp2_msg_timeout[i].msg_id == msg_id && (msg_id != HDCP_2_2_AKE_SEND_HPRIME || is_paired)) - return hdcp2_msg_data[i].timeout; - else if (hdcp2_msg_data[i].msg_id == msg_id) - return hdcp2_msg_data[i].timeout2; + return hdcp2_msg_timeout[i].timeout; + else if (hdcp2_msg_timeout[i].msg_id == msg_id) + return hdcp2_msg_timeout[i].timeout2; return -EINVAL; } |