diff options
| -rw-r--r-- | drivers/pci/pci-driver.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 68a32703b30a..c1aeeb10539e 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
| @@ -922,9 +922,6 @@ static int pci_pm_freeze(struct device *dev) | |||
| 922 | return error; | 922 | return error; |
| 923 | } | 923 | } |
| 924 | 924 | ||
| 925 | if (pcibios_pm_ops.freeze) | ||
| 926 | return pcibios_pm_ops.freeze(dev); | ||
| 927 | |||
| 928 | return 0; | 925 | return 0; |
| 929 | } | 926 | } |
| 930 | 927 | ||
| @@ -986,12 +983,6 @@ static int pci_pm_thaw(struct device *dev) | |||
| 986 | const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; | 983 | const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; |
| 987 | int error = 0; | 984 | int error = 0; |
| 988 | 985 | ||
| 989 | if (pcibios_pm_ops.thaw) { | ||
| 990 | error = pcibios_pm_ops.thaw(dev); | ||
| 991 | if (error) | ||
| 992 | return error; | ||
| 993 | } | ||
| 994 | |||
| 995 | if (pci_has_legacy_pm_support(pci_dev)) | 986 | if (pci_has_legacy_pm_support(pci_dev)) |
| 996 | return pci_legacy_resume(dev); | 987 | return pci_legacy_resume(dev); |
| 997 | 988 | ||
| @@ -1036,9 +1027,6 @@ static int pci_pm_poweroff(struct device *dev) | |||
| 1036 | Fixup: | 1027 | Fixup: |
| 1037 | pci_fixup_device(pci_fixup_suspend, pci_dev); | 1028 | pci_fixup_device(pci_fixup_suspend, pci_dev); |
| 1038 | 1029 | ||
| 1039 | if (pcibios_pm_ops.poweroff) | ||
| 1040 | return pcibios_pm_ops.poweroff(dev); | ||
| 1041 | |||
| 1042 | return 0; | 1030 | return 0; |
| 1043 | } | 1031 | } |
| 1044 | 1032 | ||
| @@ -1111,12 +1099,6 @@ static int pci_pm_restore(struct device *dev) | |||
| 1111 | const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; | 1099 | const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; |
| 1112 | int error = 0; | 1100 | int error = 0; |
| 1113 | 1101 | ||
| 1114 | if (pcibios_pm_ops.restore) { | ||
| 1115 | error = pcibios_pm_ops.restore(dev); | ||
| 1116 | if (error) | ||
| 1117 | return error; | ||
| 1118 | } | ||
| 1119 | |||
| 1120 | /* | 1102 | /* |
| 1121 | * This is necessary for the hibernation error path in which restore is | 1103 | * This is necessary for the hibernation error path in which restore is |
| 1122 | * called without restoring the standard config registers of the device. | 1104 | * called without restoring the standard config registers of the device. |
