gpio: fix probe() error return in gpio driver probes

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

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 750ee79c178f056f9ea7b56c690fdf1d966f4f3b..c697f268085698bf886e7b3a358f5343b3ce5c71 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -318,7 +318,7 @@ static void pci_device_shutdown(struct device *dev)
  * Default "suspend" method for devices that have no driver provided suspend,
  * or not even a driver at all (second part).
  */
-static void pci_default_pm_suspend_late(struct pci_dev *pci_dev)
+static void pci_pm_set_unknown_state(struct pci_dev *pci_dev)
 {
        /*
         * mark its power state as "unknown", since we don't know if
@@ -332,7 +332,7 @@ static void pci_default_pm_suspend_late(struct pci_dev *pci_dev)
  * Default "resume" method for devices that have no driver provided resume,
  * or not even a driver at all (second part).
  */
-static int pci_default_pm_resume_late(struct pci_dev *pci_dev)
+static int pci_pm_reenable_device(struct pci_dev *pci_dev)
 {
        int retval;
 
@@ -363,8 +363,11 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
                 * This is for compatibility with existing code with legacy PM
                 * support.
                 */
-               pci_default_pm_suspend_late(pci_dev);
+               pci_pm_set_unknown_state(pci_dev);
        }
+
+       pci_fixup_device(pci_fixup_suspend, pci_dev);
+
        return i;
 }
 
@@ -381,33 +384,37 @@ 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 {
                /* restore the PCI config space */
                pci_restore_state(pci_dev);
-               error = pci_default_pm_resume_late(pci_dev);
+               error = pci_pm_reenable_device(pci_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)
@@ -459,7 +466,7 @@ static int pci_pm_default_resume(struct pci_dev *pci_dev)
        if (!pci_is_bridge(pci_dev))
                pci_enable_wake(pci_dev, PCI_D0, false);
 
-       return pci_default_pm_resume_late(pci_dev);
+       return pci_pm_reenable_device(pci_dev);
 }
 
 static void pci_pm_default_suspend_generic(struct pci_dev *pci_dev)
@@ -479,14 +486,24 @@ 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)
 {
        struct pci_driver *drv = pci_dev->driver;
-
-       return drv && (drv->suspend || drv->suspend_late || drv->resume
+       bool ret = drv && (drv->suspend || drv->suspend_late || drv->resume
                || drv->resume_early);
+
+       /*
+        * Legacy PM support is used by default, so warn if the new framework is
+        * supported as well.  Drivers are supposed to support either the
+        * former, or the latter, but not both at the same time.
+        */
+       WARN_ON(ret && drv->driver.pm);
+
+       return ret;
 }
 
 /* New power management framework */
@@ -518,18 +535,16 @@ static int pci_pm_suspend(struct device *dev)
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (drv && drv->pm) {
-               if (drv->pm->suspend) {
-                       error = drv->pm->suspend(dev);
-                       suspend_report_result(drv->pm->suspend, error);
-               }
-       } else if (pci_has_legacy_pm_support(pci_dev)) {
-               error = pci_legacy_suspend(dev, PMSG_SUSPEND);
-       } else {
-               pci_pm_default_suspend(pci_dev);
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_suspend(dev, PMSG_SUSPEND);
+
+       if (drv && drv->pm && drv->pm->suspend) {
+               error = drv->pm->suspend(dev);
+               suspend_report_result(drv->pm->suspend, error);
        }
 
-       pci_fixup_device(pci_fixup_suspend, pci_dev);
+       if (!error)
+               pci_pm_default_suspend(pci_dev);
 
        return error;
 }
@@ -540,58 +555,50 @@ static int pci_pm_suspend_noirq(struct device *dev)
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (drv && drv->pm) {
-               if (drv->pm->suspend_noirq) {
-                       error = drv->pm->suspend_noirq(dev);
-                       suspend_report_result(drv->pm->suspend_noirq, error);
-               }
-       } else if (pci_has_legacy_pm_support(pci_dev)) {
-               error = pci_legacy_suspend_late(dev, PMSG_SUSPEND);
-       } else {
-               pci_default_pm_suspend_late(pci_dev);
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_suspend_late(dev, PMSG_SUSPEND);
+
+       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 (drv && drv->pm) {
-               pci_fixup_device(pci_fixup_resume, pci_dev);
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_resume_early(dev);
 
-               if (drv->pm->resume)
-                       error = drv->pm->resume(dev);
-       } else if (pci_has_legacy_pm_support(pci_dev)) {
-               pci_fixup_device(pci_fixup_resume, pci_dev);
-               error = pci_legacy_resume(dev);
-       } else {
-               error = pci_pm_default_resume(pci_dev);
-       }
+       pci_pm_default_resume_noirq(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 (drv && drv->pm) {
-               pci_fixup_device(pci_fixup_resume_early, pci_dev);
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_resume(dev);
 
-               if (drv->pm->resume_noirq)
-                       error = drv->pm->resume_noirq(dev);
-       } else if (pci_has_legacy_pm_support(pci_dev)) {
-               pci_fixup_device(pci_fixup_resume_early, pci_dev);
-               error = pci_legacy_resume_early(dev);
-       } else {
-               pci_pm_default_resume_noirq(pci_dev);
-       }
+       error = pci_pm_default_resume(pci_dev);
+
+       if (!error && drv && drv->pm && drv->pm->resume)
+               error = drv->pm->resume(dev);
 
        return error;
 }
@@ -613,18 +620,17 @@ static int pci_pm_freeze(struct device *dev)
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (drv && drv->pm) {
-               if (drv->pm->freeze) {
-                       error = drv->pm->freeze(dev);
-                       suspend_report_result(drv->pm->freeze, error);
-               }
-       } else if (pci_has_legacy_pm_support(pci_dev)) {
-               error = pci_legacy_suspend(dev, PMSG_FREEZE);
-               pci_fixup_device(pci_fixup_suspend, pci_dev);
-       } else {
-               pci_pm_default_suspend_generic(pci_dev);
+       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 (!error)
+               pci_pm_default_suspend_generic(pci_dev);
+
        return error;
 }
 
@@ -634,54 +640,50 @@ static int pci_pm_freeze_noirq(struct device *dev)
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (drv && drv->pm) {
-               if (drv->pm->freeze_noirq) {
-                       error = drv->pm->freeze_noirq(dev);
-                       suspend_report_result(drv->pm->freeze_noirq, error);
-               }
-       } else if (pci_has_legacy_pm_support(pci_dev)) {
-               error = pci_legacy_suspend_late(dev, PMSG_FREEZE);
-       } else {
-               pci_default_pm_suspend_late(pci_dev);
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_suspend_late(dev, PMSG_FREEZE);
+
+       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 (drv && drv->pm) {
-               if (drv->pm->thaw)
-                       error =  drv->pm->thaw(dev);
-       } else if (pci_has_legacy_pm_support(pci_dev)) {
-               pci_fixup_device(pci_fixup_resume, pci_dev);
-               error = pci_legacy_resume(dev);
-       } else {
-               pci_default_pm_resume_late(pci_dev);
-       }
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_resume_early(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 (drv && drv->pm) {
-               if (drv->pm->thaw_noirq)
-                       error = drv->pm->thaw_noirq(dev);
-       } else if (pci_has_legacy_pm_support(pci_dev)) {
-               pci_fixup_device(pci_fixup_resume_early, to_pci_dev(dev));
-               error = pci_legacy_resume_early(dev);
-       } else {
-               pci_update_current_state(pci_dev, PCI_D0);
-       }
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_resume(dev);
+
+       pci_pm_reenable_device(pci_dev);
+
+       if (drv && drv->pm && drv->pm->thaw)
+               error =  drv->pm->thaw(dev);
 
        return error;
 }
@@ -692,18 +694,16 @@ static int pci_pm_poweroff(struct device *dev)
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (drv && drv->pm) {
-               if (drv->pm->poweroff) {
-                       error = drv->pm->poweroff(dev);
-                       suspend_report_result(drv->pm->poweroff, error);
-               }
-       } else if (pci_has_legacy_pm_support(pci_dev)) {
-               error = pci_legacy_suspend(dev, PMSG_HIBERNATE);
-       } else {
-               pci_pm_default_suspend(pci_dev);
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_suspend(dev, PMSG_HIBERNATE);
+
+       if (drv && drv->pm && drv->pm->poweroff) {
+               error = drv->pm->poweroff(dev);
+               suspend_report_result(drv->pm->poweroff, error);
        }
 
-       pci_fixup_device(pci_fixup_suspend, pci_dev);
+       if (!error)
+               pci_pm_default_suspend(pci_dev);
 
        return error;
 }
@@ -713,56 +713,47 @@ static int pci_pm_poweroff_noirq(struct device *dev)
        struct device_driver *drv = dev->driver;
        int error = 0;
 
-       if (drv && drv->pm) {
-               if (drv->pm->poweroff_noirq) {
-                       error = drv->pm->poweroff_noirq(dev);
-                       suspend_report_result(drv->pm->poweroff_noirq, error);
-               }
-       } else if (pci_has_legacy_pm_support(to_pci_dev(dev))) {
-               error = pci_legacy_suspend_late(dev, PMSG_HIBERNATE);
+       if (pci_has_legacy_pm_support(to_pci_dev(dev)))
+               return pci_legacy_suspend_late(dev, PMSG_HIBERNATE);
+
+       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 (drv && drv->pm) {
-               pci_fixup_device(pci_fixup_resume, pci_dev);
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_resume_early(dev);
 
-               if (drv->pm->restore)
-                       error = drv->pm->restore(dev);
-       } else if (pci_has_legacy_pm_support(pci_dev)) {
-               pci_fixup_device(pci_fixup_resume, pci_dev);
-               error = pci_legacy_resume(dev);
-       } else {
-               error = pci_pm_default_resume(pci_dev);
-       }
+       pci_pm_default_resume_noirq(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 (drv && drv->pm) {
-               pci_fixup_device(pci_fixup_resume_early, pci_dev);
+       if (pci_has_legacy_pm_support(pci_dev))
+               return pci_legacy_resume(dev);
 
-               if (drv->pm->restore_noirq)
-                       error = drv->pm->restore_noirq(dev);
-       } else if (pci_has_legacy_pm_support(pci_dev)) {
-               pci_fixup_device(pci_fixup_resume_early, pci_dev);
-               error = pci_legacy_resume_early(dev);
-       } else {
-               pci_pm_default_resume_noirq(pci_dev);
-       }
+       error = pci_pm_default_resume(pci_dev);
+
+       if (!error && drv && drv->pm && drv->pm->restore)
+               error = drv->pm->restore(dev);
 
        return error;
 }