From b18e1306d0d3e109861a2ca3d4247f95f6edb7be Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Thu, 8 Mar 2012 16:01:51 +0000 Subject: [PATCH] --- yaml --- r: 293678 b: refs/heads/master c: c715bc1bf422543731b8833e899266b8be982a52 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/oaktrail_device.c | 5 ----- trunk/drivers/gpu/drm/gma500/power.c | 3 ++- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 882314f375e7..8a5d9fb6bad0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4578240b48ed33f4377748701616a870fe5a1a94 +refs/heads/master: c715bc1bf422543731b8833e899266b8be982a52 diff --git a/trunk/drivers/gpu/drm/gma500/oaktrail_device.c b/trunk/drivers/gpu/drm/gma500/oaktrail_device.c index 08dcdc29d2eb..22def104bb4a 100644 --- a/trunk/drivers/gpu/drm/gma500/oaktrail_device.c +++ b/trunk/drivers/gpu/drm/gma500/oaktrail_device.c @@ -176,10 +176,6 @@ int oaktrail_backlight_init(struct drm_device *dev) * for power management */ -static void oaktrail_init_pm(struct drm_device *dev) -{ -} - /** * oaktrail_save_display_registers - save registers lost on suspend * @dev: our DRM device @@ -504,7 +500,6 @@ const struct psb_ops oaktrail_chip_ops = { .backlight_init = oaktrail_backlight_init, #endif - .init_pm = oaktrail_init_pm, .save_regs = oaktrail_save_display_registers, .restore_regs = oaktrail_restore_display_registers, .power_down = oaktrail_power_down, diff --git a/trunk/drivers/gpu/drm/gma500/power.c b/trunk/drivers/gpu/drm/gma500/power.c index bbf635cebdbc..994f66935499 100644 --- a/trunk/drivers/gpu/drm/gma500/power.c +++ b/trunk/drivers/gpu/drm/gma500/power.c @@ -58,7 +58,8 @@ void gma_power_init(struct drm_device *dev) spin_lock_init(&power_ctrl_lock); mutex_init(&power_mutex); - dev_priv->ops->init_pm(dev); + if (dev_priv->ops->init_pm) + dev_priv->ops->init_pm(dev); } /**