1 files changed, 12 insertions, 13 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 38f3c0140dfb..454853507b7e 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -267,11 +267,19 @@ static long local_pci_probe(void *_ddi)
         pm_runtime_get_sync(dev);
         pci_dev->driver = pci_drv;
         rc = pci_drv->probe(pci_dev, ddi->id);
-        if (rc) {
+        if (!rc)
+                return rc;
+        if (rc < 0) {
                 pci_dev->driver = NULL;
                 pm_runtime_put_sync(dev);
+                return rc;
         }
-        return rc;
+        /*
+         * Probe function should return < 0 for failure, 0 for success
+         * Treat values > 0 as success, but warn.
+         */
+        dev_warn(dev, "Driver probe function unexpectedly returned %d\n", rc);
+        return 0;
 }
 
 static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
@@ -602,18 +610,10 @@ static int pci_pm_prepare(struct device *dev)
         return error;
 }
 
-static void pci_pm_complete(struct device *dev)
-{
-        struct device_driver *drv = dev->driver;
-
-        if (drv && drv->pm && drv->pm->complete)
-                drv->pm->complete(dev);
-}
 
 #else /* !CONFIG_PM_SLEEP */
 
 #define pci_pm_prepare  NULL
-#define pci_pm_complete NULL
 
 #endif /* !CONFIG_PM_SLEEP */
 
@@ -1124,9 +1124,8 @@ static int pci_pm_runtime_idle(struct device *dev)
 
 #ifdef CONFIG_PM
 
-const struct dev_pm_ops pci_dev_pm_ops = {
+static const struct dev_pm_ops pci_dev_pm_ops = {
         .prepare = pci_pm_prepare,
-        .complete = pci_pm_complete,
         .suspend = pci_pm_suspend,
         .resume = pci_pm_resume,
         .freeze = pci_pm_freeze,
@@ -1319,7 +1318,7 @@ struct bus_type pci_bus_type = {
         .probe          = pci_device_probe,
         .remove         = pci_device_remove,
         .shutdown       = pci_device_shutdown,
-        .dev_attrs      = pci_dev_attrs,
+        .dev_groups     = pci_dev_groups,
         .bus_groups     = pci_bus_groups,
         .drv_groups     = pci_drv_groups,
         .pm             = PCI_PM_OPS_PTR,