drm/i915/hdcp: rename HDCP GSC context alloc/free functions

Name the functions intel_hdcp_gsc_context_alloc() and
intel_hdcp_gsc_context_free() for consistency.

Cc: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://lore.kernel.org/r/c6e25686ed20b5fdea9a59faf6a64a7312a075b0.1745524803.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
index 3e1dc2f7310c6e77f9829793d568f48c16641613..efcd3a4b41edf8cb0780c253ce9afbc99db46d77 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
@@ -90,7 +90,7 @@ out_unpin:
        return err;
 }
 
-struct intel_hdcp_gsc_context *intel_hdcp_gsc_hdcp2_init(struct intel_display *display)
+struct intel_hdcp_gsc_context *intel_hdcp_gsc_context_alloc(struct intel_display *display)
 {
        struct drm_i915_private *i915 = to_i915(display->drm);
        struct intel_hdcp_gsc_context *gsc_context;
@@ -114,7 +114,7 @@ struct intel_hdcp_gsc_context *intel_hdcp_gsc_hdcp2_init(struct intel_display *d
        return gsc_context;
 }
 
-void intel_hdcp_gsc_free_message(struct intel_hdcp_gsc_context *gsc_context)
+void intel_hdcp_gsc_context_free(struct intel_hdcp_gsc_context *gsc_context)
 {
        if (!gsc_context)
                return;

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
index 31080df8009785412ba8f8444a95f1ed4d5aa8cf..227c00a837d80c3f403d7dd8dd0f8e85a9537b6e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
@@ -19,7 +19,7 @@ ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8 *msg_in,
                                size_t msg_out_len);
 bool intel_hdcp_gsc_check_status(struct intel_display *display);
 
-struct intel_hdcp_gsc_context *intel_hdcp_gsc_hdcp2_init(struct intel_display *display);
-void intel_hdcp_gsc_free_message(struct intel_hdcp_gsc_context *gsc_context);
+struct intel_hdcp_gsc_context *intel_hdcp_gsc_context_alloc(struct intel_display *display);
+void intel_hdcp_gsc_context_free(struct intel_hdcp_gsc_context *gsc_context);
 
 #endif /* __INTEL_HDCP_GCS_H__ */

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c
index 94ca571ab4817d3739f6f31ac701d47873ab9ec1..92143226858c58234e70cc65080eb07727069f8c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c
@@ -643,7 +643,7 @@ int intel_hdcp_gsc_init(struct intel_display *display)
 
        mutex_lock(&display->hdcp.hdcp_mutex);
 
-       gsc_context = intel_hdcp_gsc_hdcp2_init(display);
+       gsc_context = intel_hdcp_gsc_context_alloc(display);
        if (IS_ERR(gsc_context)) {
                ret = PTR_ERR(gsc_context);
                kfree(arbiter);
@@ -663,7 +663,7 @@ out:
 
 void intel_hdcp_gsc_fini(struct intel_display *display)
 {
-       intel_hdcp_gsc_free_message(display->hdcp.gsc_context);
+       intel_hdcp_gsc_context_free(display->hdcp.gsc_context);
        display->hdcp.gsc_context = NULL;
        kfree(display->hdcp.arbiter);
        display->hdcp.arbiter = NULL;

diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
index 68fac12ac666caa58d94430a9d6b133f7c596b45..16458c1ddbe6385fa8b38f571f9c95a20b3f5259 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
+++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
@@ -99,7 +99,7 @@ out:
        return ret;
 }
 
-struct intel_hdcp_gsc_context *intel_hdcp_gsc_hdcp2_init(struct intel_display *display)
+struct intel_hdcp_gsc_context *intel_hdcp_gsc_context_alloc(struct intel_display *display)
 {
        struct intel_hdcp_gsc_context *gsc_context;
        int ret;
@@ -122,7 +122,7 @@ struct intel_hdcp_gsc_context *intel_hdcp_gsc_hdcp2_init(struct intel_display *d
        return gsc_context;
 }
 
-void intel_hdcp_gsc_free_message(struct intel_hdcp_gsc_context *gsc_context)
+void intel_hdcp_gsc_context_free(struct intel_hdcp_gsc_context *gsc_context)
 {
        if (!gsc_context)
                return;