| Message ID | 20190820134019.13229-3-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] drm/i915/dp: stylistic cleanup around hdcp2_msg_data | expand |
On 2019-08-20 at 16:40:17 +0300, Jani Nikula wrote: > It's static const data, make it so. > > Cc: Ramalingam C <ramalingam.c@intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ramalingam C <ramalingam.c@intel.com> -Ram > --- > drivers/gpu/drm/i915/display/intel_dp.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 0d8a8c47296b..921ad0a2f7ba 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -5820,7 +5820,7 @@ struct hdcp2_dp_msg_data { > u32 timeout2; /* Added for non_paired situation */ > }; > > -static struct hdcp2_dp_msg_data hdcp2_dp_msg_data[] = { > +static const struct hdcp2_dp_msg_data hdcp2_dp_msg_data[] = { > { HDCP_2_2_AKE_INIT, DP_HDCP_2_2_AKE_INIT_OFFSET, false, 0, 0 }, > { HDCP_2_2_AKE_SEND_CERT, DP_HDCP_2_2_AKE_SEND_CERT_OFFSET, > false, HDCP_2_2_CERT_TIMEOUT_MS, 0 }, > @@ -5908,7 +5908,7 @@ int hdcp2_detect_msg_availability(struct intel_digital_port *intel_dig_port, > > static ssize_t > intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, > - struct hdcp2_dp_msg_data *hdcp2_msg_data) > + const struct hdcp2_dp_msg_data *hdcp2_msg_data) > { > struct intel_dp *dp = &intel_dig_port->dp; > struct intel_hdcp *hdcp = &dp->attached_connector->hdcp; > @@ -5947,7 +5947,7 @@ intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, > return ret; > } > > -static struct hdcp2_dp_msg_data *get_hdcp2_dp_msg_data(u8 msg_id) > +static const struct hdcp2_dp_msg_data *get_hdcp2_dp_msg_data(u8 msg_id) > { > int i; > > @@ -5967,7 +5967,7 @@ int intel_dp_hdcp2_write_msg(struct intel_digital_port *intel_dig_port, > unsigned int offset; > u8 *byte = buf; > ssize_t ret, bytes_to_write, len; > - struct hdcp2_dp_msg_data *hdcp2_msg_data; > + const struct hdcp2_dp_msg_data *hdcp2_msg_data; > > hdcp2_msg_data = get_hdcp2_dp_msg_data(*byte); > if (!hdcp2_msg_data) > @@ -6031,7 +6031,7 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *intel_dig_port, > unsigned int offset; > u8 *byte = buf; > ssize_t ret, bytes_to_recv, len; > - struct hdcp2_dp_msg_data *hdcp2_msg_data; > + const struct hdcp2_dp_msg_data *hdcp2_msg_data; > > hdcp2_msg_data = get_hdcp2_dp_msg_data(msg_id); > if (!hdcp2_msg_data) > -- > 2.20.1 >
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 0d8a8c47296b..921ad0a2f7ba 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -5820,7 +5820,7 @@ struct hdcp2_dp_msg_data { u32 timeout2; /* Added for non_paired situation */ }; -static struct hdcp2_dp_msg_data hdcp2_dp_msg_data[] = { +static const struct hdcp2_dp_msg_data hdcp2_dp_msg_data[] = { { HDCP_2_2_AKE_INIT, DP_HDCP_2_2_AKE_INIT_OFFSET, false, 0, 0 }, { HDCP_2_2_AKE_SEND_CERT, DP_HDCP_2_2_AKE_SEND_CERT_OFFSET, false, HDCP_2_2_CERT_TIMEOUT_MS, 0 }, @@ -5908,7 +5908,7 @@ int hdcp2_detect_msg_availability(struct intel_digital_port *intel_dig_port, static ssize_t intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, - struct hdcp2_dp_msg_data *hdcp2_msg_data) + const struct hdcp2_dp_msg_data *hdcp2_msg_data) { struct intel_dp *dp = &intel_dig_port->dp; struct intel_hdcp *hdcp = &dp->attached_connector->hdcp; @@ -5947,7 +5947,7 @@ intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, return ret; } -static struct hdcp2_dp_msg_data *get_hdcp2_dp_msg_data(u8 msg_id) +static const struct hdcp2_dp_msg_data *get_hdcp2_dp_msg_data(u8 msg_id) { int i; @@ -5967,7 +5967,7 @@ int intel_dp_hdcp2_write_msg(struct intel_digital_port *intel_dig_port, unsigned int offset; u8 *byte = buf; ssize_t ret, bytes_to_write, len; - struct hdcp2_dp_msg_data *hdcp2_msg_data; + const struct hdcp2_dp_msg_data *hdcp2_msg_data; hdcp2_msg_data = get_hdcp2_dp_msg_data(*byte); if (!hdcp2_msg_data) @@ -6031,7 +6031,7 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *intel_dig_port, unsigned int offset; u8 *byte = buf; ssize_t ret, bytes_to_recv, len; - struct hdcp2_dp_msg_data *hdcp2_msg_data; + const struct hdcp2_dp_msg_data *hdcp2_msg_data; hdcp2_msg_data = get_hdcp2_dp_msg_data(msg_id); if (!hdcp2_msg_data)
It's static const data, make it so. Cc: Ramalingam C <ramalingam.c@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)