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

Commit 16e44e3e authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Kill the dev variable in intel_suspend_complete() 



The macros we use there are the magic ones that can take either dev or
dev_priv. We'd like to move as much as possible towards dev_priv though.

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ff0b187f

drivers/gpu/drm/i915/i915_drv.c

+4 −5
Original line number Diff line number Diff line
@@ -1590,16 +1590,15 @@ static int intel_runtime_resume(struct device *device) 
 */

static int intel_suspend_complete(struct drm_i915_private *dev_priv)

{

	struct drm_device *dev = dev_priv->dev;

	int ret;



	if (IS_BROXTON(dev))

	if (IS_BROXTON(dev_priv))

		ret = bxt_suspend_complete(dev_priv);

	else if (IS_SKYLAKE(dev))

	else if (IS_SKYLAKE(dev_priv))

		ret = skl_suspend_complete(dev_priv);

	else if (IS_HASWELL(dev) || IS_BROADWELL(dev))

	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))

		ret = hsw_suspend_complete(dev_priv);

	else if (IS_VALLEYVIEW(dev))

	else if (IS_VALLEYVIEW(dev_priv))

		ret = vlv_suspend_complete(dev_priv);

	else

		ret = 0;