drm/i915: stop including i915_irq.h from i915_trace.h

[linux-block.git] / drivers / gpu / drm / i915 / display / intel_combo_phy.c

diff --git a/drivers/gpu/drm/i915/display/intel_combo_phy.c b/drivers/gpu/drm/i915/display/intel_combo_phy.c
index 64890f39c3cc6a6b6d9c64a1f8e4e1b8708eb1b8..8b870b2dd4f9d9895cc1cb6aa9c66045ab4c9579 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_combo_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_combo_phy.c
@@ -3,6 +3,7 @@
  * Copyright © 2018 Intel Corporation
  */
 
+#include "i915_reg.h"
 #include "intel_combo_phy.h"
 #include "intel_combo_phy_regs.h"
 #include "intel_de.h"
@@ -53,7 +54,6 @@ static const struct icl_procmon {
 static const struct icl_procmon *
 icl_get_procmon_ref_values(struct drm_i915_private *dev_priv, enum phy phy)
 {
-       const struct icl_procmon *procmon;
        u32 val;
 
        val = intel_de_read(dev_priv, ICL_PORT_COMP_DW3(phy));
@@ -62,23 +62,16 @@ icl_get_procmon_ref_values(struct drm_i915_private *dev_priv, enum phy phy)
                MISSING_CASE(val);
                fallthrough;
        case VOLTAGE_INFO_0_85V | PROCESS_INFO_DOT_0:
-               procmon = &icl_procmon_values[PROCMON_0_85V_DOT_0];
-               break;
+               return &icl_procmon_values[PROCMON_0_85V_DOT_0];
        case VOLTAGE_INFO_0_95V | PROCESS_INFO_DOT_0:
-               procmon = &icl_procmon_values[PROCMON_0_95V_DOT_0];
-               break;
+               return &icl_procmon_values[PROCMON_0_95V_DOT_0];
        case VOLTAGE_INFO_0_95V | PROCESS_INFO_DOT_1:
-               procmon = &icl_procmon_values[PROCMON_0_95V_DOT_1];
-               break;
+               return &icl_procmon_values[PROCMON_0_95V_DOT_1];
        case VOLTAGE_INFO_1_05V | PROCESS_INFO_DOT_0:
-               procmon = &icl_procmon_values[PROCMON_1_05V_DOT_0];
-               break;
+               return &icl_procmon_values[PROCMON_1_05V_DOT_0];
        case VOLTAGE_INFO_1_05V | PROCESS_INFO_DOT_1:
-               procmon = &icl_procmon_values[PROCMON_1_05V_DOT_1];
-               break;
+               return &icl_procmon_values[PROCMON_1_05V_DOT_1];
        }
-
-       return procmon;
 }
 
 static void icl_set_procmon_ref_values(struct drm_i915_private *dev_priv,