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

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (49 commits)
  [PATCH] acpiphp: fix acpi_path_name
  [PATCH] ibmphp: remove TRUE and FALSE
  [PATCH] PCI Hotplug: add common acpi functions to core
  [PATCH] PCI: kzalloc() conversion in drivers/pci
  [PATCH] acpiphp: Scan slots under the nested P2P bridge
  [PATCH] PCI Hotplug: SN: Fix cleanup on hotplug removal of PPB
  [PATCH] shpchp: cleanup bus speed handling
  [PATCH] PCI: fix pci_request_region[s] arg
  [PATCH] PCI: Provide a boot parameter to disable MSI
  [PATCH] PCI: the scheduled removal of PCI_LEGACY_PROC
  [PATCH] PCI: cpqphp_ctrl.c: board_replaced(): remove dead code
  [PATCH] acpiphp: fix bridge handle
  [PATCH] acpiphp - slot management fix - V4
  [PATCH] acpi: remove dock event handling from ibm_acpi
  [PATCH] acpiphp: add dock event handling
  [PATCH] acpi: export acpi_bus_trim
  [PATCH] acpiphp: add new bus to acpi
  [PATCH] PCI: Move pci_dev_put outside a spinlock
  [PATCH] PCI: PCI/Cardbus cards hidden, needs pci=assign-busses to fix
  [PATCH] PCI: fix problems with MSI-X on ia64
  ...

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 0aa14c92b570..f22f69ac6445 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -53,11 +53,10 @@ store_new_id(struct device_driver *driver, const char *buf, size_t count)
         if (fields < 0)
                 return -EINVAL;
 
-        dynid = kmalloc(sizeof(*dynid), GFP_KERNEL);
+        dynid = kzalloc(sizeof(*dynid), GFP_KERNEL);
         if (!dynid)
                 return -ENOMEM;
 
-        memset(dynid, 0, sizeof(*dynid));
         INIT_LIST_HEAD(&dynid->node);
         dynid->id.vendor = vendor;
         dynid->id.device = device;
@@ -380,14 +379,6 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner)
         /* initialize common driver fields */
         drv->driver.name = drv->name;
         drv->driver.bus = &pci_bus_type;
-        /* FIXME, once all of the existing PCI drivers have been fixed to set
-         * the pci shutdown function, this test can go away. */
-        if (!drv->driver.shutdown)
-                drv->driver.shutdown = pci_device_shutdown;
-        else
-                printk(KERN_WARNING "Warning: PCI driver %s has a struct "
-                        "device_driver shutdown method, please update!\n",
-                        drv->name);
         drv->driver.owner = owner;
         drv->driver.kobj.ktype = &pci_driver_kobj_type;
 
@@ -514,6 +505,7 @@ struct bus_type pci_bus_type = {
         .probe          = pci_device_probe,
         .remove         = pci_device_remove,
         .suspend        = pci_device_suspend,
+        .shutdown       = pci_device_shutdown,
         .resume         = pci_device_resume,
         .dev_attrs      = pci_dev_attrs,
 };