diff options
| author | Octavian Purdila <octavian.purdila@intel.com> | 2011-07-15 17:33:26 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-15 19:05:07 +0200 |
| commit | a458ca1edc318bc63a632b97ab3d04b86b81f7ef (patch) | |
| tree | f116f5a84d79c915b4b019b7e276153da570a35a /drivers/staging/gma500/psb_drv.c | |
| parent | 7d7b7adf6bf934064c8fdc4031e75f1a20aaac92 (diff) | |
| download | linux-rt-a458ca1edc318bc63a632b97ab3d04b86b81f7ef.tar.gz | |
gma500: remove the legacy PM method
PCI core only prefer one of legacy PM and new PM. And since runtime pm
is implemented, which requires the new PM method, we should remove the
legacy PM method.
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/psb_drv.c')
| -rw-r--r-- | drivers/staging/gma500/psb_drv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c index b8b98643bdca..f96a619cb63f 100644 --- a/drivers/staging/gma500/psb_drv.c +++ b/drivers/staging/gma500/psb_drv.c @@ -1144,6 +1144,8 @@ static void psb_remove(struct pci_dev *pdev) } static const struct dev_pm_ops psb_pm_ops = { + .resume = gma_power_resume, + .suspend = gma_power_suspend, .runtime_suspend = psb_runtime_suspend, .runtime_resume = psb_runtime_resume, .runtime_idle = psb_runtime_idle, @@ -1205,13 +1207,9 @@ static struct drm_driver driver = { static struct pci_driver psb_pci_driver = { .name = DRIVER_NAME, .id_table = pciidlist, - .resume = gma_power_resume, - .suspend = gma_power_suspend, .probe = psb_probe, .remove = psb_remove, -#ifdef CONFIG_PM .driver.pm = &psb_pm_ops, -#endif }; static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |