drm/i915/pch: Remove unused i915->pch_id

With the PCH checks based on PCH types instead of IDs, the i915->pch_id
member has become unused. Remove it.

Reviewed-by: Nemesa Garg <nemesa.garg@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fac1c59800128e8f398e83d718a3a5dc235d0526.1738923308.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index b96b8de12756ec060abbc5785ac1b61aa4882285..ffc346379cc2c27dfa5329b3cc5729f2ba797138 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -274,7 +274,6 @@ struct drm_i915_private {
 
        /* PCH chipset type */
        enum intel_pch pch_type;
-       unsigned short pch_id;
 
        unsigned long gem_quirks;
 

diff --git a/drivers/gpu/drm/i915/soc/intel_pch.c b/drivers/gpu/drm/i915/soc/intel_pch.c
index fa03b5068a193eadfe7efd7f18d8c0ff9984398b..82dc7fbd1a3e9213a618b9581bf7cea3bee78d81 100644 (file)
--- a/drivers/gpu/drm/i915/soc/intel_pch.c
+++ b/drivers/gpu/drm/i915/soc/intel_pch.c
@@ -286,13 +286,11 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)
                pch_type = intel_pch_type(dev_priv, id);
                if (pch_type != PCH_NONE) {
                        dev_priv->pch_type = pch_type;
-                       dev_priv->pch_id = id;
                        break;
                } else if (intel_is_virt_pch(id, pch->subsystem_vendor,
                                             pch->subsystem_device)) {
                        intel_virt_detect_pch(dev_priv, &id, &pch_type);
                        dev_priv->pch_type = pch_type;
-                       dev_priv->pch_id = id;
                        break;
                }
        }
@@ -305,12 +303,10 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)
                drm_dbg_kms(&dev_priv->drm,
                            "Display disabled, reverting to NOP PCH\n");
                dev_priv->pch_type = PCH_NOP;
-               dev_priv->pch_id = 0;
        } else if (!pch) {
                if (i915_run_as_guest() && HAS_DISPLAY(dev_priv)) {
                        intel_virt_detect_pch(dev_priv, &id, &pch_type);
                        dev_priv->pch_type = pch_type;
-                       dev_priv->pch_id = id;
                } else {
                        drm_dbg_kms(&dev_priv->drm, "No PCH found.\n");
                }

diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 8a7b159724135573386057d97affc4fd4e98aaa6..17509d3c72d418f82f9e690915e3b28373500ebd 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -544,7 +544,6 @@ struct xe_device {
         */
        struct intel_display display;
        enum intel_pch pch_type;
-       u16 pch_id;
 
        struct dram_info {
                bool wm_lv_0_adjust_needed;