Skip to content

Commit 16e44e3

Browse files
Damien Lespiaudanvet
authored andcommitted
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: Damien Lespiau <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
1 parent ff0b187 commit 16e44e3

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

drivers/gpu/drm/i915/i915_drv.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,16 +1590,15 @@ static int intel_runtime_resume(struct device *device)
15901590
*/
15911591
static int intel_suspend_complete(struct drm_i915_private *dev_priv)
15921592
{
1593-
struct drm_device *dev = dev_priv->dev;
15941593
int ret;
15951594

1596-
if (IS_BROXTON(dev))
1595+
if (IS_BROXTON(dev_priv))
15971596
ret = bxt_suspend_complete(dev_priv);
1598-
else if (IS_SKYLAKE(dev))
1597+
else if (IS_SKYLAKE(dev_priv))
15991598
ret = skl_suspend_complete(dev_priv);
1600-
else if (IS_HASWELL(dev) || IS_BROADWELL(dev))
1599+
else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
16011600
ret = hsw_suspend_complete(dev_priv);
1602-
else if (IS_VALLEYVIEW(dev))
1601+
else if (IS_VALLEYVIEW(dev_priv))
16031602
ret = vlv_suspend_complete(dev_priv);
16041603
else
16051604
ret = 0;

0 commit comments

Comments
 (0)