From 16cd1b434d3b383ea6d37ba0fe02fab999a80459 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Wed, 4 Feb 2009 02:00:11 +0100 Subject: [PATCH] --- yaml --- r: 131111 b: refs/heads/master c: 27be54a65c89c4b4aa9b25fc6fba31ffd01a08ca h: refs/heads/master i: 131109: 759d406eaf87878b64e8691ffac4d0201961d279 131107: 7737ba2417faa6e43db0247606214f2bfe8def87 131103: 8825818c143a113ae04af19c74c8c97ffd7f2185 v: v3 --- [refs] | 2 +- trunk/drivers/pci/pcie/portdrv_pci.c | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 680bc2c32805..236ea56902f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99dadce8756bf08f5f8baf749533d044f6b3ff25 +refs/heads/master: 27be54a65c89c4b4aa9b25fc6fba31ffd01a08ca diff --git a/trunk/drivers/pci/pcie/portdrv_pci.c b/trunk/drivers/pci/pcie/portdrv_pci.c index 99a914a027f8..f9b874eaeb9f 100644 --- a/trunk/drivers/pci/pcie/portdrv_pci.c +++ b/trunk/drivers/pci/pcie/portdrv_pci.c @@ -55,25 +55,13 @@ static int pcie_portdrv_suspend(struct pci_dev *dev, pm_message_t state) } -static int pcie_portdrv_suspend_late(struct pci_dev *dev, pm_message_t state) -{ - return pci_save_state(dev); -} - -static int pcie_portdrv_resume_early(struct pci_dev *dev) -{ - return pci_restore_state(dev); -} - static int pcie_portdrv_resume(struct pci_dev *dev) { - pcie_portdrv_restore_config(dev); + pci_set_master(dev); return pcie_port_device_resume(dev); } #else #define pcie_portdrv_suspend NULL -#define pcie_portdrv_suspend_late NULL -#define pcie_portdrv_resume_early NULL #define pcie_portdrv_resume NULL #endif @@ -292,8 +280,6 @@ static struct pci_driver pcie_portdriver = { .remove = pcie_portdrv_remove, .suspend = pcie_portdrv_suspend, - .suspend_late = pcie_portdrv_suspend_late, - .resume_early = pcie_portdrv_resume_early, .resume = pcie_portdrv_resume, .err_handler = &pcie_portdrv_err_handler,