Skip to content

Commit cc01b0f

Browse files
committed
drm/i915/hdcp: Clean up zero initializers
Just use a simple {} to zero initialize arrays/structs instead of the hodgepodge of stuff we are using currently. Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Jani Nikula <[email protected]>
1 parent eebc152 commit cc01b0f

File tree

1 file changed

+21
-23
lines changed

1 file changed

+21
-23
lines changed

drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ int
1313
intel_hdcp_gsc_initiate_session(struct device *dev, struct hdcp_port_data *data,
1414
struct hdcp2_ake_init *ake_data)
1515
{
16-
struct wired_cmd_initiate_hdcp2_session_in session_init_in = { { 0 } };
17-
struct wired_cmd_initiate_hdcp2_session_out
18-
session_init_out = { { 0 } };
16+
struct wired_cmd_initiate_hdcp2_session_in session_init_in = {};
17+
struct wired_cmd_initiate_hdcp2_session_out session_init_out = {};
1918
struct drm_i915_private *i915;
2019
ssize_t byte;
2120

@@ -71,8 +70,8 @@ intel_hdcp_gsc_verify_receiver_cert_prepare_km(struct device *dev,
7170
*ek_pub_km,
7271
size_t *msg_sz)
7372
{
74-
struct wired_cmd_verify_receiver_cert_in verify_rxcert_in = { { 0 } };
75-
struct wired_cmd_verify_receiver_cert_out verify_rxcert_out = { { 0 } };
73+
struct wired_cmd_verify_receiver_cert_in verify_rxcert_in = {};
74+
struct wired_cmd_verify_receiver_cert_out verify_rxcert_out = {};
7675
struct drm_i915_private *i915;
7776
ssize_t byte;
7877

@@ -134,8 +133,8 @@ int
134133
intel_hdcp_gsc_verify_hprime(struct device *dev, struct hdcp_port_data *data,
135134
struct hdcp2_ake_send_hprime *rx_hprime)
136135
{
137-
struct wired_cmd_ake_send_hprime_in send_hprime_in = { { 0 } };
138-
struct wired_cmd_ake_send_hprime_out send_hprime_out = { { 0 } };
136+
struct wired_cmd_ake_send_hprime_in send_hprime_in = {};
137+
struct wired_cmd_ake_send_hprime_out send_hprime_out = {};
139138
struct drm_i915_private *i915;
140139
ssize_t byte;
141140

@@ -182,8 +181,8 @@ int
182181
intel_hdcp_gsc_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
183182
struct hdcp2_ake_send_pairing_info *pairing_info)
184183
{
185-
struct wired_cmd_ake_send_pairing_info_in pairing_info_in = { { 0 } };
186-
struct wired_cmd_ake_send_pairing_info_out pairing_info_out = { { 0 } };
184+
struct wired_cmd_ake_send_pairing_info_in pairing_info_in = {};
185+
struct wired_cmd_ake_send_pairing_info_out pairing_info_out = {};
187186
struct drm_i915_private *i915;
188187
ssize_t byte;
189188

@@ -233,8 +232,8 @@ intel_hdcp_gsc_initiate_locality_check(struct device *dev,
233232
struct hdcp_port_data *data,
234233
struct hdcp2_lc_init *lc_init_data)
235234
{
236-
struct wired_cmd_init_locality_check_in lc_init_in = { { 0 } };
237-
struct wired_cmd_init_locality_check_out lc_init_out = { { 0 } };
235+
struct wired_cmd_init_locality_check_in lc_init_in = {};
236+
struct wired_cmd_init_locality_check_out lc_init_out = {};
238237
struct drm_i915_private *i915;
239238
ssize_t byte;
240239

@@ -279,8 +278,8 @@ int
279278
intel_hdcp_gsc_verify_lprime(struct device *dev, struct hdcp_port_data *data,
280279
struct hdcp2_lc_send_lprime *rx_lprime)
281280
{
282-
struct wired_cmd_validate_locality_in verify_lprime_in = { { 0 } };
283-
struct wired_cmd_validate_locality_out verify_lprime_out = { { 0 } };
281+
struct wired_cmd_validate_locality_in verify_lprime_in = {};
282+
struct wired_cmd_validate_locality_out verify_lprime_out = {};
284283
struct drm_i915_private *i915;
285284
ssize_t byte;
286285

@@ -329,8 +328,8 @@ int intel_hdcp_gsc_get_session_key(struct device *dev,
329328
struct hdcp_port_data *data,
330329
struct hdcp2_ske_send_eks *ske_data)
331330
{
332-
struct wired_cmd_get_session_key_in get_skey_in = { { 0 } };
333-
struct wired_cmd_get_session_key_out get_skey_out = { { 0 } };
331+
struct wired_cmd_get_session_key_in get_skey_in = {};
332+
struct wired_cmd_get_session_key_out get_skey_out = {};
334333
struct drm_i915_private *i915;
335334
ssize_t byte;
336335

@@ -381,8 +380,8 @@ intel_hdcp_gsc_repeater_check_flow_prepare_ack(struct device *dev,
381380
struct hdcp2_rep_send_ack
382381
*rep_send_ack)
383382
{
384-
struct wired_cmd_verify_repeater_in verify_repeater_in = { { 0 } };
385-
struct wired_cmd_verify_repeater_out verify_repeater_out = { { 0 } };
383+
struct wired_cmd_verify_repeater_in verify_repeater_in = {};
384+
struct wired_cmd_verify_repeater_out verify_repeater_out = {};
386385
struct drm_i915_private *i915;
387386
ssize_t byte;
388387

@@ -442,8 +441,7 @@ int intel_hdcp_gsc_verify_mprime(struct device *dev,
442441
struct hdcp2_rep_stream_ready *stream_ready)
443442
{
444443
struct wired_cmd_repeater_auth_stream_req_in *verify_mprime_in;
445-
struct wired_cmd_repeater_auth_stream_req_out
446-
verify_mprime_out = { { 0 } };
444+
struct wired_cmd_repeater_auth_stream_req_out verify_mprime_out = {};
447445
struct drm_i915_private *i915;
448446
ssize_t byte;
449447
size_t cmd_size;
@@ -504,8 +502,8 @@ int intel_hdcp_gsc_verify_mprime(struct device *dev,
504502
int intel_hdcp_gsc_enable_authentication(struct device *dev,
505503
struct hdcp_port_data *data)
506504
{
507-
struct wired_cmd_enable_auth_in enable_auth_in = { { 0 } };
508-
struct wired_cmd_enable_auth_out enable_auth_out = { { 0 } };
505+
struct wired_cmd_enable_auth_in enable_auth_in = {};
506+
struct wired_cmd_enable_auth_out enable_auth_out = {};
509507
struct drm_i915_private *i915;
510508
ssize_t byte;
511509

@@ -549,8 +547,8 @@ int intel_hdcp_gsc_enable_authentication(struct device *dev,
549547
int
550548
intel_hdcp_gsc_close_session(struct device *dev, struct hdcp_port_data *data)
551549
{
552-
struct wired_cmd_close_session_in session_close_in = { { 0 } };
553-
struct wired_cmd_close_session_out session_close_out = { { 0 } };
550+
struct wired_cmd_close_session_in session_close_in = {};
551+
struct wired_cmd_close_session_out session_close_out = {};
554552
struct drm_i915_private *i915;
555553
ssize_t byte;
556554

0 commit comments

Comments
 (0)