Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e365c39 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: sanitize suspend/resume helper function names 



By now the S4 freeze/thaw and S3 suspend/resume events are handled the
same way, so we can rename the freeze/thaw internal helpers to
suspend/resume accordingly to make clearer what the helpers do. Also
rename i915_resume_early to i915_drm_resume_early aligning it with the
rest of the helper names.

No functional change.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 36d61e67

drivers/gpu/drm/i915/i915_drv.c

+7 −12
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static int intel_suspend_complete(struct drm_i915_private *dev_priv); 
static int intel_resume_prepare(struct drm_i915_private *dev_priv,

				bool rpm_resume);



static int i915_drm_freeze(struct drm_device *dev)

static int i915_drm_suspend(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc;
@@ -666,14 +666,14 @@ int i915_suspend(struct drm_device *dev, pm_message_t state) 
	if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)

		return 0;



	error = i915_drm_freeze(dev);

	error = i915_drm_suspend(dev);

	if (error)

		return error;



	return i915_drm_suspend_late(dev);

}



static int __i915_drm_thaw(struct drm_device *dev)

static int i915_drm_resume(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -741,7 +741,7 @@ static int __i915_drm_thaw(struct drm_device *dev) 
	return 0;

}



static int i915_resume_early(struct drm_device *dev)

static int i915_drm_resume_early(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	int ret;
@@ -771,11 +771,6 @@ static int i915_resume_early(struct drm_device *dev) 
	return ret;

}



static int i915_drm_resume(struct drm_device *dev)

{

	return __i915_drm_thaw(dev);

}



static int i915_resume_legacy(struct drm_device *dev)

{

	int ret;
@@ -783,7 +778,7 @@ static int i915_resume_legacy(struct drm_device *dev) 
	if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)

		return 0;



	ret = i915_resume_early(dev);

	ret = i915_drm_resume_early(dev);

	if (ret)

		return ret;
@@ -944,7 +939,7 @@ static int i915_pm_suspend(struct device *dev) 
	if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)

		return 0;



	return i915_drm_freeze(drm_dev);

	return i915_drm_suspend(drm_dev);

}



static int i915_pm_suspend_late(struct device *dev)
@@ -975,7 +970,7 @@ static int i915_pm_resume_early(struct device *dev) 
	if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)

		return 0;



	return i915_resume_early(drm_dev);

	return i915_drm_resume_early(drm_dev);

}



static int i915_pm_resume(struct device *dev)