Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (47 commits)
  Driver core: Don't call put methods while holding a spinlock
  Driver core: Remove unneeded routines from driver core
  Driver core: Fix potential deadlock in driver core
  PCI: enable driver multi-threaded probe
  Driver Core: add ability for drivers to do a threaded probe
  sysfs: add proper sysfs_init() prototype
  drivers/base: check errors
  drivers/base: Platform notify needs to occur before drivers attach to the device
  v4l-dev2: handle __must_check
  add CONFIG_ENABLE_MUST_CHECK
  add __must_check to device management code
  Driver core: fixed add_bind_files() definition
  Driver core: fix comments in drivers/base/power/resume.c
  sysfs_remove_bin_file: no return value, dump_stack on error
  kobject: must_check fixes
  Driver core: add ability for devices to create and remove bin files
  Class: add support for class interfaces for devices
  Driver core: create devices/virtual/ tree
  Driver core: add device_rename function
  Driver core: add ability for classes to handle devices properly
  ...

4 files changed, 66 insertions, 5 deletions

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 4d762fc4878c..c27e782e6df9 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -17,6 +17,31 @@ config PCI_MSI
 
            If you don't know what to do here, say N.
 
+config PCI_MULTITHREAD_PROBE
+        bool "PCI Multi-threaded probe (EXPERIMENTAL)"
+        depends on PCI && EXPERIMENTAL
+        help
+          Say Y here if you want the PCI core to spawn a new thread for
+          every PCI device that is probed.  This can cause a huge
+          speedup in boot times on multiprocessor machines, and even a
+          smaller speedup on single processor machines.
+
+          But it can also cause lots of bad things to happen.  A number
+          of PCI drivers can not properly handle running in this way,
+          some will just not work properly at all, while others might
+          decide to blow up power supplies with a huge load all at once,
+          so use this option at your own risk.
+
+          It is very unwise to use this option if you are not using a
+          boot process that can handle devices being created in any
+          order.  A program that can create persistant block and network
+          device names (like udev) is a good idea if you wish to use
+          this option.
+
+          Again, use this option at your own risk, you have been warned!
+
+          When in doubt, say N.
+
 config PCI_DEBUG
         bool "PCI Debugging"
         depends on PCI && DEBUG_KERNEL
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 317457dd4014..d0a07d9ab30c 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -487,9 +487,7 @@ static void __exit ibm_acpiphp_exit(void)
         if (ACPI_FAILURE(status))
                 err("%s: Notification handler removal failed\n", __FUNCTION__);
         /* remove the /sys entries */
-        if (sysfs_remove_bin_file(sysdir, &ibm_apci_table_attr))
-                err("%s: removal of sysfs file apci_table failed\n",
-                                __FUNCTION__);
+        sysfs_remove_bin_file(sysdir, &ibm_apci_table_attr);
 }
 
 module_init(ibm_acpiphp_init);
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 474e9cd0e9e4..d8ace1f90dd2 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -17,6 +17,16 @@
  *  Registration of PCI drivers and handling of hot-pluggable devices.
  */
 
+/* multithreaded probe logic */
+static int pci_multithread_probe =
+#ifdef CONFIG_PCI_MULTITHREAD_PROBE
+        1;
+#else
+        0;
+#endif
+__module_param_call("", pci_multithread_probe, param_set_bool, param_get_bool, &pci_multithread_probe, 0644);
+
+
 /*
  * Dynamic device IDs are disabled for !CONFIG_HOTPLUG
  */
@@ -279,6 +289,18 @@ static int pci_device_suspend(struct device * dev, pm_message_t state)
         return i;
 }
 
+static int pci_device_suspend_late(struct device * dev, pm_message_t state)
+{
+        struct pci_dev * pci_dev = to_pci_dev(dev);
+        struct pci_driver * drv = pci_dev->driver;
+        int i = 0;
+
+        if (drv && drv->suspend_late) {
+                i = drv->suspend_late(pci_dev, state);
+                suspend_report_result(drv->suspend_late, i);
+        }
+        return i;
+}
 
 /*
  * Default resume method for devices that have no driver provided resume,
@@ -313,6 +335,17 @@ static int pci_device_resume(struct device * dev)
         return error;
 }
 
+static int pci_device_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;
+}
+
 static void pci_device_shutdown(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
@@ -385,6 +418,7 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner)
         drv->driver.bus = &pci_bus_type;
         drv->driver.owner = owner;
         drv->driver.kobj.ktype = &pci_driver_kobj_type;
+        drv->driver.multithread_probe = pci_multithread_probe;
 
         spin_lock_init(&drv->dynids.lock);
         INIT_LIST_HEAD(&drv->dynids.list);
@@ -509,8 +543,10 @@ struct bus_type pci_bus_type = {
         .probe          = pci_device_probe,
         .remove         = pci_device_remove,
         .suspend        = pci_device_suspend,
-        .shutdown       = pci_device_shutdown,
+        .suspend_late   = pci_device_suspend_late,
+        .resume_early   = pci_device_resume_early,
         .resume         = pci_device_resume,
+        .shutdown       = pci_device_shutdown,
         .dev_attrs      = pci_dev_attrs,
 };
 
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 9f79dd6d51ab..8ab027886034 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -432,10 +432,12 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
         case PM_EVENT_ON:
                 return PCI_D0;
         case PM_EVENT_FREEZE:
+        case PM_EVENT_PRETHAW:
+                /* REVISIT both freeze and pre-thaw "should" use D0 */
         case PM_EVENT_SUSPEND:
                 return PCI_D3hot;
         default:
-                printk("They asked me for state %d\n", state.event);
+                printk("Unrecognized suspend event %d\n", state.event);
                 BUG();
         }
         return PCI_D0;