korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-20 09:34:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: sanitize suspend/resume helper function names

Browse Source 
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: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Imre Deak 2014-10-23 19:23:25 +03:00 committed by Daniel Vetter
parent 36d61e6751
commit 5e365c391a
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/i915/i915_drv.c
View File

@ -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, static int intel_resume_prepare(struct drm_i915_private *dev_priv,
bool rpm_resume); 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_i915_private *dev_priv = dev->dev_private;
struct drm_crtc *crtc; 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) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0; return 0;
error = i915_drm_freeze(dev); error = i915_drm_suspend(dev);
if (error) if (error)
return error; return error;
return i915_drm_suspend_late(dev); 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; struct drm_i915_private *dev_priv = dev->dev_private;
@ -741,7 +741,7 @@ static int __i915_drm_thaw(struct drm_device *dev)
return 0; 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; struct drm_i915_private *dev_priv = dev->dev_private;
int ret; int ret;
@ -771,11 +771,6 @@ static int i915_resume_early(struct drm_device *dev)
return ret; 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) static int i915_resume_legacy(struct drm_device *dev)
{ {
int ret; int ret;
@ -783,7 +778,7 @@ static int i915_resume_legacy(struct drm_device *dev)
if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0; return 0;
ret = i915_resume_early(dev); ret = i915_drm_resume_early(dev);
if (ret) if (ret)
return 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) if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0; return 0;
return i915_drm_freeze(drm_dev); return i915_drm_suspend(drm_dev);
} }
static int i915_pm_suspend_late(struct device *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) if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0; return 0;
return i915_resume_early(drm_dev); return i915_drm_resume_early(drm_dev);
} }
static int i915_pm_resume(struct device *dev) static int i915_pm_resume(struct device *dev)