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, 3 insertions, 6 deletions

diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 060d74775d7b..71b80c23e8ce 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -95,15 +95,13 @@ static int add_slot(struct pci_dev *dev)
         struct hotplug_slot *slot;
         int retval = -ENOMEM;
 
-        slot = kmalloc(sizeof(struct hotplug_slot), GFP_KERNEL);
+        slot = kzalloc(sizeof(struct hotplug_slot), GFP_KERNEL);
         if (!slot)
                 goto error;
-        memset(slot, 0, sizeof(*slot));
 
-        slot->info = kmalloc(sizeof(struct hotplug_slot_info), GFP_KERNEL);
+        slot->info = kzalloc(sizeof(struct hotplug_slot_info), GFP_KERNEL);
         if (!slot->info)
                 goto error_slot;
-        memset(slot->info, 0, sizeof(struct hotplug_slot_info));
 
         slot->info->power_status = 1;
         slot->info->max_bus_speed = PCI_SPEED_UNKNOWN;
@@ -227,11 +225,10 @@ static void pci_rescan_bus(const struct pci_bus *bus)
 {
         unsigned int devfn;
         struct pci_dev *dev;
-        dev = kmalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
         if (!dev)
                 return;
 
-        memset(dev, 0, sizeof(dev));
         dev->bus = (struct pci_bus*)bus;
         dev->sysdata = bus->sysdata;
         for (devfn = 0; devfn < 0x100; devfn += 8) {