diff options
| -rw-r--r-- | drivers/pci/pcie/portdrv_pci.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index 99a914a027f8..f9b874eaeb9f 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c | |||
| @@ -55,25 +55,13 @@ static int pcie_portdrv_suspend(struct pci_dev *dev, pm_message_t state) | |||
| 55 | 55 | ||
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | static int pcie_portdrv_suspend_late(struct pci_dev *dev, pm_message_t state) | ||
| 59 | { | ||
| 60 | return pci_save_state(dev); | ||
| 61 | } | ||
| 62 | |||
| 63 | static int pcie_portdrv_resume_early(struct pci_dev *dev) | ||
| 64 | { | ||
| 65 | return pci_restore_state(dev); | ||
| 66 | } | ||
| 67 | |||
| 68 | static int pcie_portdrv_resume(struct pci_dev *dev) | 58 | static int pcie_portdrv_resume(struct pci_dev *dev) |
| 69 | { | 59 | { |
| 70 | pcie_portdrv_restore_config(dev); | 60 | pci_set_master(dev); |
| 71 | return pcie_port_device_resume(dev); | 61 | return pcie_port_device_resume(dev); |
| 72 | } | 62 | } |
| 73 | #else | 63 | #else |
| 74 | #define pcie_portdrv_suspend NULL | 64 | #define pcie_portdrv_suspend NULL |
| 75 | #define pcie_portdrv_suspend_late NULL | ||
| 76 | #define pcie_portdrv_resume_early NULL | ||
| 77 | #define pcie_portdrv_resume NULL | 65 | #define pcie_portdrv_resume NULL |
| 78 | #endif | 66 | #endif |
| 79 | 67 | ||
| @@ -292,8 +280,6 @@ static struct pci_driver pcie_portdriver = { | |||
| 292 | .remove = pcie_portdrv_remove, | 280 | .remove = pcie_portdrv_remove, |
| 293 | 281 | ||
| 294 | .suspend = pcie_portdrv_suspend, | 282 | .suspend = pcie_portdrv_suspend, |
| 295 | .suspend_late = pcie_portdrv_suspend_late, | ||
| 296 | .resume_early = pcie_portdrv_resume_early, | ||
| 297 | .resume = pcie_portdrv_resume, | 283 | .resume = pcie_portdrv_resume, |
| 298 | 284 | ||
| 299 | .err_handler = &pcie_portdrv_err_handler, | 285 | .err_handler = &pcie_portdrv_err_handler, |
