Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / pci / pci-driver.c

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 2e76945..c697f26 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -365,6 +365,9 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
                 */
                pci_pm_set_unknown_state(pci_dev);
        }
+
+       pci_fixup_device(pci_fixup_suspend, pci_dev);
+
        return i;
 }
 
@@ -381,12 +384,27 @@ static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
        return i;
 }
 
+static int pci_legacy_resume_early(struct device *dev)
+{
+       int error = 0;
+       struct pci_dev * pci_dev = to_pci_dev(dev);
+       struct pci_driver * drv = pci_dev->driver;
+
+       pci_fixup_device(pci_fixup_resume_early, pci_dev);
+
+       if (drv && drv->resume_early)
+               error = drv->resume_early(pci_dev);
+       return error;
+}
+
 static int pci_legacy_resume(struct device *dev)
 {
        int error;
        struct pci_dev * pci_dev = to_pci_dev(dev);
        struct pci_driver * drv = pci_dev->driver;
 
+       pci_fixup_device(pci_fixup_resume, pci_dev);
+
        if (drv && drv->resume) {
                error = drv->resume(pci_dev);
        } else {
@@ -397,17 +415,6 @@ static int pci_legacy_resume(struct device *dev)
        return error;
 }
 
-static int pci_legacy_resume_early(struct device *dev)
-{
-       int error = 0;
-       struct pci_dev * pci_dev = to_pci_dev(dev);
-       struct pci_driver * drv = pci_dev->driver;
-
-       if (drv && drv->resume_early)
-               error = drv->resume_early(pci_dev);
-       return error;
-}
-
 /* Auxiliary functions used by the new power management framework */
 
 static int pci_restore_standard_config(struct pci_dev *pci_dev)
@@ -479,6 +486,8 @@ static void pci_pm_default_suspend(struct pci_dev *pci_dev)
 
        if (!pci_is_bridge(pci_dev))
                pci_prepare_to_sleep(pci_dev);
+
+       pci_fixup_device(pci_fixup_suspend, pci_dev);
 }
 
 static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev)
@@ -526,22 +535,16 @@ static int pci_pm_suspend(struct device *dev)
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (pci_has_legacy_pm_support(pci_dev)) {
-               error = pci_legacy_suspend(dev, PMSG_SUSPEND);
-               goto Exit;
-       }
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_suspend(dev, PMSG_SUSPEND);
 
-       if (drv && drv->pm) {
-               if (drv->pm->suspend) {
-                       error = drv->pm->suspend(dev);
-                       suspend_report_result(drv->pm->suspend, error);
-               }
-       } else {
-               pci_pm_default_suspend(pci_dev);
+       if (drv && drv->pm && drv->pm->suspend) {
+               error = drv->pm->suspend(dev);
+               suspend_report_result(drv->pm->suspend, error);
        }
 
- Exit:
-       pci_fixup_device(pci_fixup_suspend, pci_dev);
+       if (!error)
+               pci_pm_default_suspend(pci_dev);
 
        return error;
 }
@@ -555,60 +558,47 @@ static int pci_pm_suspend_noirq(struct device *dev)
        if (pci_has_legacy_pm_support(pci_dev))
                return pci_legacy_suspend_late(dev, PMSG_SUSPEND);
 
-       if (drv && drv->pm) {
-               if (drv->pm->suspend_noirq) {
-                       error = drv->pm->suspend_noirq(dev);
-                       suspend_report_result(drv->pm->suspend_noirq, error);
-               }
-       } else {
-               pci_pm_set_unknown_state(pci_dev);
+       if (drv && drv->pm && drv->pm->suspend_noirq) {
+               error = drv->pm->suspend_noirq(dev);
+               suspend_report_result(drv->pm->suspend_noirq, error);
        }
 
+       if (!error)
+               pci_pm_set_unknown_state(pci_dev);
+
        return error;
 }
 
-static int pci_pm_resume(struct device *dev)
+static int pci_pm_resume_noirq(struct device *dev)
 {
        struct pci_dev *pci_dev = to_pci_dev(dev);
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (pci_has_legacy_pm_support(pci_dev)) {
-               pci_fixup_device(pci_fixup_resume, pci_dev);
-               return pci_legacy_resume(dev);
-       }
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_resume_early(dev);
 
-       if (drv && drv->pm) {
-               pci_fixup_device(pci_fixup_resume, pci_dev);
+       pci_pm_default_resume_noirq(pci_dev);
 
-               if (drv->pm->resume)
-                       error = drv->pm->resume(dev);
-       } else {
-               error = pci_pm_default_resume(pci_dev);
-       }
+       if (drv && drv->pm && drv->pm->resume_noirq)
+               error = drv->pm->resume_noirq(dev);
 
        return error;
 }
 
-static int pci_pm_resume_noirq(struct device *dev)
+static int pci_pm_resume(struct device *dev)
 {
        struct pci_dev *pci_dev = to_pci_dev(dev);
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (pci_has_legacy_pm_support(pci_dev)) {
-               pci_fixup_device(pci_fixup_resume_early, pci_dev);
-               return pci_legacy_resume_early(dev);
-       }
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_resume(dev);
 
-       if (drv && drv->pm) {
-               pci_fixup_device(pci_fixup_resume_early, pci_dev);
+       error = pci_pm_default_resume(pci_dev);
 
-               if (drv->pm->resume_noirq)
-                       error = drv->pm->resume_noirq(dev);
-       } else {
-               pci_pm_default_resume_noirq(pci_dev);
-       }
+       if (!error && drv && drv->pm && drv->pm->resume)
+               error = drv->pm->resume(dev);
 
        return error;
 }
@@ -630,20 +620,16 @@ static int pci_pm_freeze(struct device *dev)
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (pci_has_legacy_pm_support(pci_dev)) {
-               error = pci_legacy_suspend(dev, PMSG_FREEZE);
-               pci_fixup_device(pci_fixup_suspend, pci_dev);
-               return error;
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_suspend(dev, PMSG_FREEZE);
+
+       if (drv && drv->pm && drv->pm->freeze) {
+               error = drv->pm->freeze(dev);
+               suspend_report_result(drv->pm->freeze, error);
        }
 
-       if (drv && drv->pm) {
-               if (drv->pm->freeze) {
-                       error = drv->pm->freeze(dev);
-                       suspend_report_result(drv->pm->freeze, error);
-               }
-       } else {
+       if (!error)
                pci_pm_default_suspend_generic(pci_dev);
-       }
 
        return error;
 }
@@ -657,56 +643,47 @@ static int pci_pm_freeze_noirq(struct device *dev)
        if (pci_has_legacy_pm_support(pci_dev))
                return pci_legacy_suspend_late(dev, PMSG_FREEZE);
 
-       if (drv && drv->pm) {
-               if (drv->pm->freeze_noirq) {
-                       error = drv->pm->freeze_noirq(dev);
-                       suspend_report_result(drv->pm->freeze_noirq, error);
-               }
-       } else {
-               pci_pm_set_unknown_state(pci_dev);
+       if (drv && drv->pm && drv->pm->freeze_noirq) {
+               error = drv->pm->freeze_noirq(dev);
+               suspend_report_result(drv->pm->freeze_noirq, error);
        }
 
+       if (!error)
+               pci_pm_set_unknown_state(pci_dev);
+
        return error;
 }
 
-static int pci_pm_thaw(struct device *dev)
+static int pci_pm_thaw_noirq(struct device *dev)
 {
        struct pci_dev *pci_dev = to_pci_dev(dev);
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (pci_has_legacy_pm_support(pci_dev)) {
-               pci_fixup_device(pci_fixup_resume, pci_dev);
-               return pci_legacy_resume(dev);
-       }
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_resume_early(dev);
 
-       if (drv && drv->pm) {
-               if (drv->pm->thaw)
-                       error =  drv->pm->thaw(dev);
-       } else {
-               pci_pm_reenable_device(pci_dev);
-       }
+       pci_update_current_state(pci_dev, PCI_D0);
+
+       if (drv && drv->pm && drv->pm->thaw_noirq)
+               error = drv->pm->thaw_noirq(dev);
 
        return error;
 }
 
-static int pci_pm_thaw_noirq(struct device *dev)
+static int pci_pm_thaw(struct device *dev)
 {
        struct pci_dev *pci_dev = to_pci_dev(dev);
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (pci_has_legacy_pm_support(pci_dev)) {
-               pci_fixup_device(pci_fixup_resume_early, to_pci_dev(dev));
-               return pci_legacy_resume_early(dev);
-       }
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_resume(dev);
 
-       if (drv && drv->pm) {
-               if (drv->pm->thaw_noirq)
-                       error = drv->pm->thaw_noirq(dev);
-       } else {
-               pci_update_current_state(pci_dev, PCI_D0);
-       }
+       pci_pm_reenable_device(pci_dev);
+
+       if (drv && drv->pm && drv->pm->thaw)
+               error =  drv->pm->thaw(dev);
 
        return error;
 }
@@ -717,22 +694,16 @@ static int pci_pm_poweroff(struct device *dev)
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (pci_has_legacy_pm_support(pci_dev)) {
-               error = pci_legacy_suspend(dev, PMSG_HIBERNATE);
-               goto Exit;
-       }
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_suspend(dev, PMSG_HIBERNATE);
 
-       if (drv && drv->pm) {
-               if (drv->pm->poweroff) {
-                       error = drv->pm->poweroff(dev);
-                       suspend_report_result(drv->pm->poweroff, error);
-               }
-       } else {
-               pci_pm_default_suspend(pci_dev);
+       if (drv && drv->pm && drv->pm->poweroff) {
+               error = drv->pm->poweroff(dev);
+               suspend_report_result(drv->pm->poweroff, error);
        }
 
- Exit:
-       pci_fixup_device(pci_fixup_suspend, pci_dev);
+       if (!error)
+               pci_pm_default_suspend(pci_dev);
 
        return error;
 }
@@ -745,58 +716,44 @@ static int pci_pm_poweroff_noirq(struct device *dev)
        if (pci_has_legacy_pm_support(to_pci_dev(dev)))
                return pci_legacy_suspend_late(dev, PMSG_HIBERNATE);
 
-       if (drv && drv->pm) {
-               if (drv->pm->poweroff_noirq) {
-                       error = drv->pm->poweroff_noirq(dev);
-                       suspend_report_result(drv->pm->poweroff_noirq, error);
-               }
+       if (drv && drv->pm && drv->pm->poweroff_noirq) {
+               error = drv->pm->poweroff_noirq(dev);
+               suspend_report_result(drv->pm->poweroff_noirq, error);
        }
 
        return error;
 }
 
-static int pci_pm_restore(struct device *dev)
+static int pci_pm_restore_noirq(struct device *dev)
 {
        struct pci_dev *pci_dev = to_pci_dev(dev);
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (pci_has_legacy_pm_support(pci_dev)) {
-               pci_fixup_device(pci_fixup_resume, pci_dev);
-               return pci_legacy_resume(dev);
-       }
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_resume_early(dev);
 
-       if (drv && drv->pm) {
-               pci_fixup_device(pci_fixup_resume, pci_dev);
+       pci_pm_default_resume_noirq(pci_dev);
 
-               if (drv->pm->restore)
-                       error = drv->pm->restore(dev);
-       } else {
-               error = pci_pm_default_resume(pci_dev);
-       }
+       if (drv && drv->pm && drv->pm->restore_noirq)
+               error = drv->pm->restore_noirq(dev);
 
        return error;
 }
 
-static int pci_pm_restore_noirq(struct device *dev)
+static int pci_pm_restore(struct device *dev)
 {
        struct pci_dev *pci_dev = to_pci_dev(dev);
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (pci_has_legacy_pm_support(pci_dev)) {
-               pci_fixup_device(pci_fixup_resume_early, pci_dev);
-               return pci_legacy_resume_early(dev);
-       }
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_resume(dev);
 
-       if (drv && drv->pm) {
-               pci_fixup_device(pci_fixup_resume_early, pci_dev);
+       error = pci_pm_default_resume(pci_dev);
 
-               if (drv->pm->restore_noirq)
-                       error = drv->pm->restore_noirq(dev);
-       } else {
-               pci_pm_default_resume_noirq(pci_dev);
-       }
+       if (!error && drv && drv->pm && drv->pm->restore)
+               error = drv->pm->restore(dev);
 
        return error;
 }