drm/i915: Add intel_ prefix to struct ip_version

Rename struct ip_version to intel_ip_version to comply with the
naming conventions for structures.

Suggested-by: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221011153851.3781507-1-radhakrishna.sripada@intel.com

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 090097bb3c0a4bdb60123384ceda2e4d27235d61..37267c662dc6f2b9b7047f48cc14957eac80d22a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -289,7 +289,7 @@ static void intel_device_info_subplatform_init(struct drm_i915_private *i915)
        RUNTIME_INFO(i915)->platform_mask[pi] |= mask;
 }
 
-static void ip_ver_read(struct drm_i915_private *i915, u32 offset, struct ip_version *ip)
+static void ip_ver_read(struct drm_i915_private *i915, u32 offset, struct intel_ip_version *ip)
 {
        struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
        void __iomem *addr;

diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 8e494c59f9a188d189f0bf49634fb2d1707b13b1..4da73f4e47519137eeeee5f492779a3316e37734 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -194,7 +194,7 @@ enum intel_ppgtt_type {
        func(overlay_needs_physical); \
        func(supports_tv);
 
-struct ip_version {
+struct intel_ip_version {
        u8 ver;
        u8 rel;
        u8 step;
@@ -206,13 +206,13 @@ struct intel_runtime_info {
         * render, compute and copy behavior.
         */
        struct {
-               struct ip_version ip;
+               struct intel_ip_version ip;
        } graphics;
        struct {
-               struct ip_version ip;
+               struct intel_ip_version ip;
        } media;
        struct {
-               struct ip_version ip;
+               struct intel_ip_version ip;
        } display;
 
        /*

diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c
index 91e7c51991b03888ba5b0d639a8dc7a9bb46cc4d..75d7a86c60c07dce5e1ad7095398d3693c9b9e80 100644 (file)
--- a/drivers/gpu/drm/i915/intel_step.c
+++ b/drivers/gpu/drm/i915/intel_step.c
@@ -136,7 +136,7 @@ static const struct intel_step_info adlp_n_revids[] = {
 };
 
 static u8 gmd_to_intel_step(struct drm_i915_private *i915,
-                           struct ip_version *gmd)
+                           struct intel_ip_version *gmd)
 {
        u8 step = gmd->step + STEP_A0;