From: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Date: Tue, 11 Oct 2022 15:38:50 +0000 (-0700)
Subject: drm/i915: Add intel_ prefix to struct ip_version
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ef7e222cd68f7b7c654f23fce51e8be888a3d7ee;p=linux.git

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 090097bb3c0a4..37267c662dc6f 100644
--- 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 8e494c59f9a18..4da73f4e47519 100644
--- 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 91e7c51991b03..75d7a86c60c07 100644
--- 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;