2 files changed, 1 insertions, 11 deletions

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index bf2492fe5b41..cc0492e02d97 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -2241,9 +2241,6 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv)
         struct drm_device *dev = dev_priv->dev;
         struct device *device = &dev->pdev->dev;
 
-        if (!HAS_RUNTIME_PM(dev))
-                return;
-
         pm_runtime_get_sync(device);
         WARN(dev_priv->pm.suspended, "Device still suspended.\n");
 }
@@ -2270,9 +2267,6 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)
         struct drm_device *dev = dev_priv->dev;
         struct device *device = &dev->pdev->dev;
 
-        if (!HAS_RUNTIME_PM(dev))
-                return;
-
         WARN(dev_priv->pm.suspended, "Getting nosync-ref while suspended.\n");
         pm_runtime_get_noresume(device);
 }
@@ -2290,9 +2284,6 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv)
         struct drm_device *dev = dev_priv->dev;
         struct device *device = &dev->pdev->dev;
 
-        if (!HAS_RUNTIME_PM(dev))
-                return;
-
         pm_runtime_mark_last_busy(device);
         pm_runtime_put_autosuspend(device);
 }
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index fcf04fe69296..022677685561 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -53,8 +53,7 @@ intel_uncore_forcewake_domain_to_str(const enum forcewake_domain_id id)
 static void
 assert_device_not_suspended(struct drm_i915_private *dev_priv)
 {
-        WARN_ONCE(HAS_RUNTIME_PM(dev_priv->dev) && dev_priv->pm.suspended,
-                  "Device suspended\n");
+        WARN_ONCE(dev_priv->pm.suspended, "Device suspended\n");
 }
 
 static inline void